Browse Source

remove print

ilya_shyian 1 year ago
parent
commit
10e18c232d

+ 1 - 29
store_back/apps/authAPI/schema.py

@@ -103,6 +103,7 @@ class Query(graphene.ObjectType):
         if len(filter_params):
             query_set = query_set.filter(reduce(operator.or_,(Q(**d) for d in [dict([i]) for i in filter_params.items()])))
 
+        print(query_set)
         query_set = query_set.order_by(order_by)[skip:skip+limit]
         return query_set
 
@@ -228,34 +229,6 @@ class UserUpsert(graphene.Mutation):
 
 
 
-# class GoodDelete(graphene.Mutation):
-
-#     class Arguments:
-#         good = GoodInput(required=True)
-
-#     Output =GoodType
-
-#     @staticmethod
-#     def mutate(root,info,good):
-#         user = info.context.user
-#         if not user.is_superuser:
-#             raise Exception("Authentication credentials were not provided")
-
-
-#         try:
-#             _id = good._id
-#             good_to_delete = Good.objects.get(_id=_id)
-#             good_data = model_to_dict(good_to_delete)
-#             good_data["_id"] = new_good._id
-#             good_to_delete.delete()
-#         except:
-#             raise Exception("Не вірні дані")
-
-
-
-#         return GoodType(**good_data)
-
-
 
 
 
@@ -268,7 +241,6 @@ class Mutations(graphene.ObjectType):
 
 
     UserUpsert =  UserUpsert.Field()
-    # GoodDelete = GoodDelete.Field()
 
 
 

+ 1 - 1
store_back/apps/authAPI/serializers.py

@@ -7,7 +7,7 @@ class MyTokenObtainPairSerializer(TokenObtainPairSerializer):
     @classmethod
     def get_token(cls, user):
         token = super().get_token(user)
-
+        
         # Add custom claims
         token['iat'] = str(datetime.timestamp(datetime.now()))
         token["sub"] = {

+ 0 - 1
store_back/apps/authAPI/views.py

@@ -20,7 +20,6 @@ def register(request):
 
             return JsonResponse({"data":{"_id":newUser._id}}, safe=False)
         else:
-            print(form.errors)
             return JsonResponse({"errors":[{"message":"Невірні дані"}]}, safe=False)
 
     return JsonResponse({"errors":[{"message":"Invalid method, method must be POST"}]}, safe=False)

+ 24 - 15
store_back/apps/categories/schema.py

@@ -108,9 +108,10 @@ class CategoryUpsert(graphene.Mutation):
 
     @staticmethod
     def mutate(root,info,category ={}):
-        new_category={}
+        new_category=None
         good_list = []
         subcategories_list = []
+        _id = category.get("_id",None)
 
         user = info.context.user
         if not user.is_superuser:
@@ -126,26 +127,34 @@ class CategoryUpsert(graphene.Mutation):
             category.pop("subcategories",None)
 
         try:
-            _id = category._id
-            new_category = Category.objects.get(_id = _id)
-            new_category.__dict__.update(**category)
-        except Exception as e:
+            if _id:
+                new_category = Category.objects.get(_id = _id)
+            else:
+                new_category = Category()
+        except:
+            raise Exception("Невірні дані")
+
 
-            new_category = Category(**category)
-            
-        
         if "parent" in category:
             try:
-                print(category)
-                print(category.get("parent",None) == "null")
-                print(category.get("parent",None))
-
-                if not category.get("parent")["_id"] == "null":
+                if not category.get("parent"):
                     new_category.parent = None
-                else: 
+                else:
                     new_category.parent = Category.objects.get(_id=category.get("parent")["_id"])
-            except:
+            except Exception as e:
                 raise Exception("Невірні дані (parent)")
+            category.pop("parent",None)
+
+
+
+        try:
+            new_category.__dict__.update(**category)
+        except Exception as e:
+            raise Exception("Невірні дані")
+            
+            
+        
+
 
         new_category.save()
         if len(good_list):

+ 0 - 1
store_back/apps/goods/views.py

@@ -129,7 +129,6 @@ def image_upsert(request):
             image = Image.objects.create(url =file )
             image.save()
             serializer = ImageSerializer(image)
-            print(serializer.data)
             return JsonResponse({"data":serializer.data}, safe=False)
         else:
             return JsonResponse({"data":{}}, safe=False)

+ 1 - 1
store_back/prod.py

@@ -4,6 +4,6 @@ from datetime import timedelta
 
 
 CSRF_TRUSTED_ORIGINS = ["http://188.72.209.29"]
-ALLOWED_HOSTS = ["http://188.72.209.29","127.0.0.1","http://127.0.0.1:8000","http://188.72.209.29:8000","http://localhost:8000"]
+ALLOWED_HOSTS = ["http://188.72.209.29","http://127.0.0.1","http://127.0.0.1:8000","http://188.72.209.29:8000","http://localhost:8000"]
 SECURE_HSTS_SECONDS = 2_592_000