kit-eco.social/consumocuidado-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'sam' into development

Browse Source
This commit is contained in:
Sam
2021-02-10 12:03:54 +00:00
parent 3b801768e4 4d35f67587
commit 07c3a42ee8
11 changed files with 143 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
README.md
View File

@@ -8,6 +8,7 @@ This README aims to document functionality of backend as well as required steps
- [Location Data](#location-data)
- [Endpoints](#endpoints)
- [Data Load](#data-load)
- [GeoIP Setup](#geoip-setup)
- [Development Utils](#development-utils)
## First Steps
@@ -177,6 +178,22 @@ CSV headers: `id,nombre-producto,descripcion,imagen,url,precio,gastos-envio,cond
Only admin users have access to endoint
## GeoIP Setup
Module: `geoip2`
- Download the `GeoLite2 City` and `GeoLite2 Country` binary datasets from maxmind.com
- Unzip files into `datasets/` folder
- Set `settings.GEOIP_PATH` to datasets folder
Optional:
- install `libmaxminddb` C library for improved performance:
`sudo apt install libmaxminddb0 libmaxminddb-dev mmdb-bin`
## Development Utils
### Fake product load

3
back_latienda/settings/development.py
View File

@@ -21,8 +21,9 @@ DATABASES = {
},
}
MEDIA_ROOT = BASE_DIR + '/media/'
MEDIA_ROOT = BASE_DIR + '/../media/'
MEDIA_URL = '/media/'
GEOIP_PATH = BASE_DIR + '/../datasets/'
# JWT SETTINGS
SIMPLE_JWT = {

85
companies/views.py
View File

@@ -1,8 +1,9 @@
import logging
from django.shortcuts import render
from django.shortcuts import render, get_object_or_404
from django.core.mail import EmailMessage
from django.template.loader import render_to_string
from django.contrib.gis.geoip2 import GeoIP2
# Create your views here.
from rest_framework import viewsets
@@ -10,6 +11,9 @@ from rest_framework.response import Response
from rest_framework.permissions import IsAuthenticatedOrReadOnly, IsAuthenticated
from rest_framework.decorators import api_view, permission_classes, action
from ipware import get_client_ip
from stats.models import StatsLog
from companies.models import Company
from companies.serializers import CompanySerializer
@@ -29,31 +33,92 @@ class CompanyViewSet(viewsets.ModelViewSet):
"""
Send email to company.creator
"""
try:
queryset = self.get_custom_queryset(request)
instance = queryset.filter(pk=kwargs['pk']).first()
if instance:
# IP stuff
client_ip, is_routable = get_client_ip(request)
g = GeoIP2()
# deserialize payload
data = json.loads(request.body)
if request.user.is_authenticated:
# send email to manager
message = render_to_string('company_contact.html', {
'user': request.user,
company_message = render_to_string('company_contact.html', {
'company': instance,
'email': request.user.email,
'full_name': request.user.full_name,
'quantity': data['quantity'],
'phone_number': data.get('phone_number'),
'comments': data['comments'],
'product_info': data['product_info'],
})
user_message = render_to_string('confirm_company_contact.html', {
'company': instance,
'username': request.user.full_name,
'data': data,
})
email = EmailMessage(subject, message, to=[instance.creator.email])
# send email to company
subject = "Contacto de usuario"
email = EmailMessage(subject, company_message, to=[instance.creator.email])
email.send()
logging.info(f"Email sent to {instance.creator.email} as manager of {instance.name}")
# send confirmation email to user
message = render_to_string('confirm_company_contact.html', {
'user': request.user,
})
subject = 'Confirmación de contacto'
email = EmailMessage(subject, message, to=[request.user.email])
email.send()
logging.info(f"Confirmation email sent to {request.user.email}")
logging.info(f"Contact confirmation email sent to {request.user.email}")
stats_data = {
'action_object': instance,
'user': None,
'anonymous': True,
'ip_address': client_ip,
'geo': g.geos(client_ip),
'contact': True,
'shop': instance.shop,
}
else:
# for unauthenticated users
company_message = render_to_string('company_contact.html', {
'company': instance,
'email': data['email'],
'full_name': data['full_name'],
'quantity': data['quantity'],
'phone_number': data.get('phone_number'),
'comments': data['comments'],
'product_info': data['product_info'],
})
user_message = render_to_string('confirm_company_contact.html', {
'company': instance,
'username': data['full_name'],
})
# send email to company
email = EmailMessage(subject, company_message, to=[instance.creator.email])
email.send()
logging.info(f"Email sent to {instance.creator.email} as manager of {instance.name}")
# send confirmation email to user
email = EmailMessage(subject, user_message, to=[data['email']])
email.send()
logging.info(f"Contact confirmation email sent to anonymous user {data['email']}")
# statslog data to register interaction
stats_data = {
'action_object': instance,
'user': request.user,
'anonymous': False,
'ip_address': client_ip,
'geo': g.geos(client_ip),
'contact': True,
'shop': instance.shop,
}
# create statslog instance to register interaction
StatsLog.objects.create(**stats_data)
return Response(data=data)
else:
return Response({"errors":{"details": f"No instance of company with id {kwargs['pk']}",}})
except Exception as e:
return Response({"errors":{"details": str(e),}}, status=500)
@api_view(['GET',])

5
core/utils.py
View File

@@ -17,8 +17,10 @@ class AccountActivationTokenGenerator(PasswordResetTokenGenerator):
def _make_hash_value(self, user, timestamp):
return f"{user.pk}{timestamp}{user.full_name}"
account_activation_token = AccountActivationTokenGenerator()
def get_tokens_for_user(user):
refresh = RefreshToken.for_user(user)
@@ -39,12 +41,14 @@ def get_auth_token(client, email, password):
# logging.error(f"User {email} was refused a token: {response.content}")
return None
def create_active_user(email, password):
user = User.objects.create_user(email=email, password=password)
user.is_active = True
user.save()
return user
def create_admin_user(email, password):
user = User.objects.create_user(email=email, password=password)
user.is_staff = True
@@ -52,6 +56,7 @@ def create_admin_user(email, password):
user.save()
return user
def send_verification_email(request, user):
try:
current_site = get_current_site(request)

BIN
datasets/GeoLite2-City.mmdb Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 61 MiB

BIN
datasets/GeoLite2-Country.mmdb Normal file
View File

Binary file not shown.

7
products/views.py
View File

@@ -13,7 +13,7 @@ from rest_framework import status
from rest_framework import viewsets
from rest_framework.response import Response
from rest_framework.permissions import IsAuthenticatedOrReadOnly, IsAdminUser, IsAuthenticated
from rest_framework.decorators import api_view, permission_classes
from rest_framework.decorators import api_view, permission_classes, action
import requests
@@ -42,6 +42,11 @@ class ProductViewSet(viewsets.ModelViewSet):
def perform_create(self, serializer):
serializer.save(creator=self.request.user)
@action(detail=True, methods=['GET',])
def related(request):
# find the most similar products
return Response(data=[])
@api_view(['GET',])
@permission_classes([IsAuthenticated,])

2
requirements.txt
View File

@@ -11,3 +11,5 @@ django-taggit-serializer==0.1.7
django-tagulous==1.1.0
Pillow==8.1.0
drf-extra-fields==3.0.4
django-ipware==3.0.2
geoip2==4.1.0

10
stats/models.py
View File

@@ -1,5 +1,6 @@
from django.contrib.gis.db import models
from django.contrib.contenttypes.models import ContentType
from django.contrib.contenttypes.fields import GenericForeignKey
from django.contrib.auth import get_user_model
User = get_user_model()
@@ -7,7 +8,14 @@ User = get_user_model()
class StatsLog(models.Model):
model = models.ForeignKey(ContentType, on_delete=models.DO_NOTHING, null=True)
action_object_content_type = models.ForeignKey(
ContentType, blank=True,
null=True,
related_name='statslogs',
on_delete=models.CASCADE
)
action_object_object_id = models.CharField(max_length=255, blank=True, null=True)
action_object = GenericForeignKey('action_object_content_type', 'action_object_object_id')
user = models.ForeignKey(User, on_delete=models.DO_NOTHING, null=True)
anonymous = models.BooleanField('Usuario no registrado', null=True)
ip_address = models.GenericIPAddressField('IP usuario', null=True, blank=True)

10
templates/company_contact.html
View File

@@ -0,0 +1,10 @@
Hola {{company.creator.full_name}}.
Estamos contactando contigo como usuario gerente de la compañina {{company.company_name}}.
Datos de usuario:
- {{user.full_name}}
- {{user.email}}
Contenido del mensaje:
{{data}}

2
templates/confirm_contact_company.html
View File

@@ -0,0 +1,2 @@
Hola {{user.full_name}}.
Hemos enviado un email a {{company.company_name}} sobre tu petición.