Added Complete Supplier,Customer,Staff and Admin Management

Author: hackstarsj

Backend/EcommerceInventory/EcommerceInventory/Helpers.py

@@ -16,6 +16,7 @@ def getDynamicFormModels():
         'warehouse':'InventoryServices.Warehouse',
         'supplier':'UserServices.Users',
         'rackShelfFloor':'InventoryServices.RackAndShelvesAndFloor',
+        'users':'UserServices.Users',
     }
 
 def getSuperAdminDynamicFormModels():
@@ -24,10 +25,10 @@ def getSuperAdminDynamicFormModels():
     }
 
 def checkisFileField(field):
-    return field in ['image','file','path','video','audio']
+    return field in ['image','file','path','video','audio','profile_pic']
 
 def getExludeFields():
-    return ['id','created_at','updated_at','domain_user_id','added_by_user_id','created_by_user_id','updated_by_user_id']
+    return ['id','created_at','updated_at','domain_user_id','added_by_user_id','created_by_user_id','updated_by_user_id','is_staff','is_superuser','is_active','plan_type','last_login','last_device','date_joined','last_ip','domain_name']
 
 def getDynamicFormFields(model_instance,domain_user_id):
     fields={'text':[],'select':[],'checkbox':[],'radio':[],'textarea':[],'json':[],'file':[]}
@@ -164,6 +165,67 @@ def wrapped_list_method(self,request,*args,**kwargs):
         return decorator
 
 
+class CommonListAPIMixinWithFilter:
+    serializer_class=None
+    pagination_class=CustomPageNumberPagination
+
+    def get_queryset(self):
+        raise NotImplementedError('get_queryset method not implemented')
+    
+    def common_list_decorator(serializer_class):
+        def decorator(list_method):
+            @wraps(list_method)
+            def wrapped_list_method(self,request,*args,**kwargs):
+                queryset=self.get_queryset()
+                search_query=self.request.query_params.get('search',None)
+
+                filtered_params=self.request.query_params.dict()
+                key_to_remove=['search','ordering','pageSize','page']
+                for key in key_to_remove:
+                    if key in filtered_params:
+                        filtered_params.pop(key,None)
+                
+                if filtered_params:
+                    search_conditions=Q()
+                    for key,value in filtered_params.items():
+                        search_conditions|=Q(**{f"{key}":value})
+                    queryset=queryset.filter(search_conditions)
+
+                if search_query:
+                    search_conditions=Q()
+
+                    for field in serializer_class.Meta.model._meta.get_fields():
+                        if isinstance(field,(models.CharField,models.TextField)):
+                            search_conditions|=Q(**{f"{field.name}__icontains":search_query})
+                    queryset=queryset.filter(search_conditions)
+
+                ordering=self.request.query_params.get('ordering',None)
+
+                if ordering:
+                    queryset=queryset.order_by(ordering)
+
+                page=self.paginate_queryset(queryset)
+
+                if page is not None:
+                    serializer=self.get_serializer(page,many=True)
+                    data=serializer.data
+                    total_pages=self.paginator.page.paginator.num_pages
+                    current_page=self.paginator.page.number
+                    page_size=self.paginator.page.paginator.per_page
+                    total_items=self.paginator.page.paginator.count
+                else:
+                    serializer=self.get_serializer(queryset,many=True)
+                    data=serializer.data
+                    total_pages=1
+                    current_page=1
+                    page_size=len(data)
+                    total_items=len(data)
+                filterFields=[{"key":field.name,"option":[{"id":choice[0],'value':choice[1]} for choice in field.choices] if field.choices else None } for field in serializer_class.Meta.model._meta.fields if field.name in serializer_class.Meta.fields]
+                return renderResponse(data={'filterFields':filterFields,'data':data,'totalPages':total_pages,'currentPage':current_page,'pageSize':page_size,'totalItems':total_items},message='Data Retrieved Successfully',status=200)
+            return wrapped_list_method
+        return decorator
+
+
 def createParsedCreatedAtUpdatedAt(cls):
     cls.formatted_created_at=serializers.SerializerMethodField()
     cls.formatted_updated_at=serializers.SerializerMethodField()

Backend/EcommerceInventory/EcommerceInventory/__pycache__/Helpers.cpython-311.pyc

@@ -1,19 +1,62 @@
-from EcommerceInventory.Helpers import renderResponse
+from EcommerceInventory.Helpers import CommonListAPIMixin, CommonListAPIMixinWithFilter, CustomPageNumberPagination, createParsedCreatedAtUpdatedAt, renderResponse
 from UserServices.models import Users
 from rest_framework.views import APIView
 from rest_framework.permissions import IsAuthenticated
 from rest_framework_simplejwt.authentication import JWTAuthentication
 from rest_framework import serializers
+from rest_framework import generics
 
 class UserSerializer(serializers.ModelSerializer):
     class Meta:
         model=Users
         fields=['id','username','first_name','last_name','email','profile_pic']
 
+@createParsedCreatedAtUpdatedAt
+class UserSerializerWithFilters(serializers.ModelSerializer):
+    date_joined=serializers.DateTimeField(format="%dth %B %Y, %H:%M", read_only=True)
+    last_login=serializers.DateTimeField(format="%dth %B %Y, %H:%M", read_only=True)
+    added_by_user_id=serializers.SerializerMethodField()
+    domain_user_id=serializers.SerializerMethodField()
+    class Meta:
+        model=Users
+        fields=['id', 'first_name', 'last_name', 'date_joined', 'email', 'phone', 'address', 'city', 'state', 'pincode', 'country', 'profile_pic', 'account_status', 'role', 'dob', 'username', 'social_media_links', 'addition_details', 'language', 'departMent', 'designation', 'time_zone', 'last_login', 'last_device', 'last_ip', 'currency', 'domain_name', 'plan_type', 'created_at', 'updated_at', 'domain_user_id', 'added_by_user_id']
+
+    def get_domain_user_id(self,obj):
+        return "#"+str(obj.domain_user_id.id) +" "+obj.domain_user_id.username if obj.domain_user_id!=None else ''
+    
+    def get_added_by_user_id(self,obj):
+        return "#"+str(obj.added_by_user_id.id) +" "+obj.added_by_user_id.username if obj.added_by_user_id!=None else ''
+
 class UserListView(APIView):
     permission_classes = [IsAuthenticated]
     authentication_classes = [JWTAuthentication]
     def get(self,request):
         users=Users.objects.filter(domain_user_id=request.user.domain_user_id.id)
         serializer=UserSerializer(users,many=True)
         return renderResponse(data=serializer.data,message="All Users",status=200)
+
+class UserWithFilterListView(generics.ListAPIView):
+    serializer_class = UserSerializerWithFilters
+    authentication_classes = [JWTAuthentication]
+    permission_classes = [IsAuthenticated]
+    pagination_class = CustomPageNumberPagination
+
+    def get_queryset(self):
+        queryset=Users.objects.filter(domain_user_id=self.request.user.domain_user_id.id)
+        return queryset
+    
+    @CommonListAPIMixinWithFilter.common_list_decorator(UserSerializerWithFilters)
+    def list(self,request,*args,**kwargs):
+        return super().list(request,*args,**kwargs)
+
+
+class UpdateUsers(generics.UpdateAPIView):
+    serializer_class = UserSerializerWithFilters
+    authentication_classes = [JWTAuthentication]
+    permission_classes = [IsAuthenticated]
+
+    def get_queryset(self):
+        return Users.objects.filter(domain_user_id=self.request.user.domain_user_id.id,id=self.kwargs['pk'])
+
+    def perform_update(self,serializer):
+        serializer.save()

Backend/EcommerceInventory/UserServices/Controller/UserController.py

@@ -0,0 +1,55 @@
+# Generated by Django 5.0.6 on 2024-07-30 08:30
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('UserServices', '0003_alter_modules_module_description_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='users',
+            name='added_by_user_id',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='added_by_user_id_user', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='users',
+            name='account_status',
+            field=models.CharField(blank=True, choices=[('Active', 'Active'), ('Inactive', 'Inactive'), ('Blocked', 'Blocked')], default='Active', max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='users',
+            name='country',
+            field=models.CharField(blank=True, choices=[('India', 'India'), ('USA', 'USA'), ('UK', 'UK'), ('Australia', 'Australia'), ('Canada', 'Canada'), ('Germany', 'Germany'), ('France', 'France'), ('Italy', 'Italy'), ('Japan', 'Japan'), ('China', 'China'), ('Russia', 'Russia'), ('Brazil', 'Brazil'), ('South Africa', 'South Africa'), ('Nigeria', 'Nigeria'), ('Mexico', 'Mexico'), ('Argentina', 'Argentina'), ('Spain', 'Spain'), ('Portugal', 'Portugal'), ('Greece', 'Greece'), ('Sweden', 'Sweden'), ('Norway', 'Norway'), ('Finland', 'Finland'), ('Denmark', 'Denmark'), ('Netherlands', 'Netherlands'), ('Belgium', 'Belgium'), ('Switzerland', 'Switzerland'), ('Austria', 'Austria'), ('Poland', 'Poland'), ('Czech Republic', 'Czech Republic'), ('Turkey', 'Turkey'), ('Ukraine', 'Ukraine'), ('Hungary', 'Hungary'), ('Romania', 'Romania'), ('Bulgaria', 'Bulgaria'), ('Croatia', 'Croatia'), ('Slovenia', 'Slovenia'), ('Slovakia', 'Slovakia'), ('Lithuania', 'Lithuania'), ('Latvia', 'Latvia'), ('Estonia', 'Estonia'), ('Ireland', 'Ireland'), ('Scotland', 'Scotland'), ('Wales', 'Wales'), ('Northern Ireland', 'Northern Ireland'), ('New Zealand', 'New Zealand'), ('Singapore', 'Singapore'), ('Malaysia', 'Malaysia'), ('Thailand', 'Thailand'), ('Indonesia', 'Indonesia'), ('Philippines', 'Philippines'), ('Vietnam', 'Vietnam'), ('South Korea', 'South Korea'), ('North Korea', 'North Korea'), ('Taiwan', 'Taiwan'), ('Hong Kong', 'Hong Kong'), ('Macau', 'Macau'), ('Bangladesh', 'Bangladesh'), ('Pakistan', 'Pakistan'), ('Sri Lanka', 'Sri Lanka'), ('Nepal', 'Nepal'), ('Bhutan', 'Bhutan'), ('Maldives', 'Maldives'), ('Afghanistan', 'Afghanistan'), ('Iran', 'Iran'), ('Iraq', 'Iraq'), ('Syria', 'Syria'), ('Lebanon', 'Lebanon')], default='India', max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='users',
+            name='currency',
+            field=models.CharField(blank=True, choices=[('USD', 'USD'), ('INR', 'INR'), ('EUR', 'EUR'), ('GBP', 'GBP'), ('AUD', 'AUD'), ('CAD', 'CAD'), ('JPY', 'JPY'), ('CNY', 'CNY'), ('RUB', 'RUB'), ('BRL', 'BRL'), ('ZAR', 'ZAR'), ('NGN', 'NGN'), ('MXN', 'MXN'), ('ARS', 'ARS'), ('CHF', 'CHF'), ('SEK', 'SEK'), ('NOK', 'NOK'), ('DKK', 'DKK'), ('PLN', 'PLN'), ('CZK', 'CZK'), ('TRY', 'TRY'), ('UAH', 'UAH'), ('HUF', 'HUF'), ('RON', 'RON'), ('BGN', 'BGN'), ('HRK', 'HRK'), ('SLO', 'SLO'), ('SK', 'SK'), ('LT', 'LT'), ('LV', 'LV'), ('EE', 'EE'), ('IE', 'IE'), ('SC', 'SC'), ('WL', 'WL'), ('NI', 'NI'), ('NZ', 'NZ'), ('SGD', 'SGD'), ('MYR', 'MYR'), ('THB', 'THB'), ('IDR', 'IDR'), ('PHP', 'PHP'), ('VND', 'VND'), ('KRW', 'KRW'), ('KPW', 'KPW'), ('TWD', 'TWD'), ('HKD', 'HKD'), ('MOP', 'MOP'), ('BDT', 'BDT'), ('PKR', 'PKR'), ('LKR', 'LKR'), ('NPR', 'NPR'), ('BTN', 'BTN'), ('MVR', 'MVR'), ('AFN', 'AFN'), ('IRR', 'IRR'), ('IQD', 'IQD'), ('SYP', 'SYP'), ('LBN', 'LBN')], default='INR', max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='users',
+            name='language',
+            field=models.CharField(blank=True, choices=[('English', 'English'), ('Hindi', 'Hindi'), ('Spanish', 'Spanish'), ('French', 'French'), ('German', 'German'), ('Italian', 'Italian'), ('Portuguese', 'Portuguese'), ('Russian', 'Russian'), ('Chinese', 'Chinese'), ('Japanese', 'Japanese'), ('Korean', 'Korean'), ('Arabic', 'Arabic'), ('Turkish', 'Turkish'), ('Dutch', 'Dutch'), ('Polish', 'Polish'), ('Swedish', 'Swedish'), ('Danish', 'Danish'), ('Norwegian', 'Norwegian'), ('Finnish', 'Finnish'), ('Greek', 'Greek'), ('Czech', 'Czech'), ('Hungarian', 'Hungarian'), ('Romanian', 'Romanian'), ('Bulgarian', 'Bulgarian'), ('Croatian', 'Croatian'), ('Slovak', 'Slovak'), ('Slovenian', 'Slovenian'), ('Lithuanian', 'Lithuanian'), ('Latvian', 'Latvian'), ('Estonian', 'Estonian'), ('Ukrainian', 'Ukrainian'), ('Belarusian', 'Belarusian'), ('Serbian', 'Serbian'), ('Macedonian', 'Macedonian'), ('Bosnian', 'Bosnian'), ('Albanian', 'Albanian'), ('Montenegrin', 'Montenegrin'), ('Catalan', 'Catalan'), ('Basque', 'Basque'), ('Galician', 'Galician'), ('Welsh', 'Welsh'), ('Irish', 'Irish'), ('Scots Gaelic', 'Scots Gaelic'), ('Manx', 'Manx'), ('Cornish', 'Cornish'), ('Breton', 'Breton')], default='English', max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='users',
+            name='plan_type',
+            field=models.CharField(blank=True, choices=[('Free', 'Free'), ('Basic', 'Basic'), ('Standard', 'Standard'), ('Premium', 'Premium'), ('Enterprise', 'Enterprise')], default='Free', max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='users',
+            name='role',
+            field=models.CharField(blank=True, choices=[('Admin', 'Admin'), ('Supplier', 'Supplier'), ('Customer', 'Customer'), ('Staff', 'Staff')], default='Admin', max_length=50, null=True),
+        ),
+        migrations.AlterField(
+            model_name='users',
+            name='time_zone',
+            field=models.CharField(blank=True, choices=[('UTC-12:00', 'UTC-12:00'), ('UTC-11:00', 'UTC-11:00'), ('UTC-10:00', 'UTC-10:00'), ('UTC-09:30', 'UTC-09:30'), ('UTC-09:00', 'UTC-09:00'), ('UTC-08:00', 'UTC-08:00'), ('UTC-07:00', 'UTC-07:00'), ('UTC-06:00', 'UTC-06:00'), ('UTC-05:00', 'UTC-05:00'), ('UTC-04:00', 'UTC-04:00'), ('UTC-03:30', 'UTC-03:30'), ('UTC-03:00', 'UTC-03:00'), ('UTC-02:00', 'UTC-02:00'), ('UTC-01:00', 'UTC-01:00'), ('UTC', 'UTC'), ('UTC+01:00', 'UTC+01:00'), ('UTC+02:00', 'UTC+02:00'), ('UTC+03:00', 'UTC+03:00'), ('UTC+03:30', 'UTC+03:30'), ('UTC+04:00', 'UTC+04:00'), ('UTC+04:30', 'UTC+04:30'), ('UTC+05:00', 'UTC+05:00'), ('UTC+05:30', 'UTC+05:30'), ('UTC+05:45', 'UTC+05:45'), ('UTC+06:00', 'UTC+06:00'), ('UTC+06:30', 'UTC+06:30'), ('UTC+07:00', 'UTC+07:00'), ('UTC+08:00', 'UTC+08:00'), ('UTC+08:45', 'UTC+08:45'), ('UTC+09:00', 'UTC+09:00'), ('UTC+09:30', 'UTC+09:30'), ('UTC+10:00', 'UTC+10:00'), ('UTC+10:30', 'UTC+10:30'), ('UTC+11:00', 'UTC+11:00'), ('UTC+12:00', 'UTC+12:00'), ('UTC+12:45', 'UTC+12:45'), ('UTC+13:00', 'UTC+13:00'), ('UTC+14:00', 'UTC+14:00')], default='UTC+05:30', max_length=50, null=True),
+        ),
+    ]

Backend/EcommerceInventory/UserServices/Controller/__pycache__/DynamicFormController.cpython-311.pyc

@@ -0,0 +1,17 @@
+# Generated by Django 5.0.6 on 2024-07-30 08:34
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('UserServices', '0004_users_added_by_user_id_alter_users_account_status_and_more'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='users',
+            name='name',
+        ),
+    ]

Backend/EcommerceInventory/UserServices/Controller/__pycache__/UserController.cpython-311.pyc

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.6 on 2024-07-30 09:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('UserServices', '0005_remove_users_name'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='users',
+            name='profile_pic',
+            field=models.JSONField(),
+        ),
+    ]