Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop

apps/establishment/management/commands/update_employee.py

@@ -33,7 +33,7 @@ class Command(BaseCommand):
         for e in tqdm(self.employees_sql()):
             empl = Employee.objects.filter(old_id=e.profile_id).update(name=e.name)
 
-        EstablishmentEmployee.objects.filter(from_date__isnull=True, old_id__isnull=True)\
+        EstablishmentEmployee.objects.filter(from_date__isnull=True, old_id__isnull=False)\
             .update(from_date=timezone.now()-timezone.timedelta(days=1))
 
         self.stdout.write(self.style.WARNING(f'Update employee name objects.'))

apps/news/views.py

@@ -44,10 +44,10 @@ class NewsDetailView(NewsMixinView, generics.RetrieveAPIView):
     lookup_field = 'slug'
     serializer_class = serializers.NewsDetailWebSerializer
 
-    queryset = models.News.objects.all()
-
     def get_queryset(self):
-        return self.queryset
+        """Override get_queryset method."""
+        qs = models.News.objects.all().annotate_in_favorites(self.request.user)
+        return qs
 
 
 class NewsTypeListView(generics.ListAPIView):

apps/notification/transfer_data.py

@@ -1,6 +1,5 @@
 from pprint import pprint
 
-from account.models import User
 from transfer.models import EmailAddresses, NewsletterSubscriber
 from transfer.serializers.notification import SubscriberSerializer, NewsletterSubscriberSerializer
 
@@ -17,17 +16,13 @@ def transfer_subscriber():
 
 
 def transfer_newsletter_subscriber():
-    users = User.objects.filter(old_id__isnull=False).values_list('old_id', flat=True)
+    queryset = NewsletterSubscriber.objects.all().values(
-    queryset = NewsletterSubscriber.objects.filter(
-        email_address__account_id__in=list(users)
-    ).values(
         'id',
         'email_address__email',
         'email_address__account_id',
         'email_address__ip',
         'email_address__country_code',
         'email_address__locale',
-        'state', 
         'created_at',
     )
     

apps/product/views/common.py

@@ -10,14 +10,15 @@ from comment.serializers import CommentRUDSerializer
 
 class ProductBaseView(generics.GenericAPIView):
     """Product base view"""
-    permission_classes = (permissions.AllowAny, )
+    permission_classes = (permissions.AllowAny,)
 
     def get_queryset(self):
         """Override get_queryset method."""
         return Product.objects.published() \
-                              .with_base_related() \
+            .with_base_related() \
-                              .by_country_code(self.request.country_code) \
+            .annotate_in_favorites(self.request.user) \
-                              .order_by('-created')
+            .by_country_code(self.request.country_code) \
+            .order_by('-created')
 
 
 class ProductListView(ProductBaseView, generics.ListAPIView):
@@ -67,9 +68,9 @@ class ProductCommentListView(generics.ListAPIView):
         """Override get_queryset method"""
         product = get_object_or_404(Product, slug=self.kwargs['slug'])
         return Comment.objects.by_content_type(app_label='product',
-                                               model='product')\
+                                               model='product') \
-                              .by_object_id(object_id=product.pk)\
+            .by_object_id(object_id=product.pk) \
-                              .order_by('-created')
+            .order_by('-created')
 
 
 class ProductCommentRUDView(generics.RetrieveUpdateDestroyAPIView):

apps/transfer/serializers/notification.py

@@ -36,15 +36,14 @@ class SubscriberSerializer(serializers.ModelSerializer):
 
 
 class NewsletterSubscriberSerializer(serializers.Serializer):
-    pass
+    id = serializers.IntegerField()
-    # vintage = serializers.IntegerField()
+    email_address__email = serializers.CharField()
-    # mark = serializers.FloatField(allow_null=True)
+    email_address__account_id = serializers.IntegerField(allow_null=True)
-    # establishment_id = serializers.IntegerField()
+    email_address__ip = serializers.CharField(allow_null=True)
-    # created_at = serializers.DateTimeField(format='%m-%d-%Y %H:%M:%S')
+    email_address__country_code = serializers.CharField(allow_null=True)
-    # aasm_state = serializers.CharField(allow_null=True)
+    email_address__locale = serializers.CharField(allow_null=True)
-    # reviewer_id = serializers.IntegerField()
+    created_at = serializers.DateTimeField(format='%m-%d-%Y %H:%M:%S')
-    # id = serializers.IntegerField()
+
-    #
     # def validate(self, data):
     #     data.update({
     #         'reviewer': self.get_reviewer(data),