From acd34b86b829a62ba3088d2a5c6407938f2f62ae Mon Sep 17 00:00:00 2001
From: Mohamed Nouffer <nouffer@gmail.com>
Date: Fri, 26 Jan 2024 11:43:29 +0530
Subject: [PATCH] disable docker pg

---
 .DS_Store           | Bin 10244 -> 10244 bytes
 docker-compose.yaml |  76 ++++++++++++++++++++++----------------------
 rog/backend.py      |   1 +
 rog/models.py       |  19 ++++++-----
 rog/views.py        |  10 ++++++
 5 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 41a446de171a2122d581b5c9f8fe324c517ad373..f7b2d25634840967b86769d184e0087156353348 100644
GIT binary patch
delta 172
zcmZn(XbIS$DiFtK<j=ssz`~%%kj{|FP?DSP;*yk;p9B=+NSG|oJ-zv;BdUA~UipFy
z!{Frn+ybB;1_q0Q&CLQ^n3z}XHJWTCEX9_vSS0RU%;YFx85pxhSeEg|=2^l`j7%p#
UPL>l5VQko3EV_~(nKzLM04QuR;s5{u

delta 172
zcmZn(XbIS$DiFu(_l<#pfrUYjA)O(Up(Hoo#U&{xKM5$t@p{Q0wdedt9Z}^|@X8lt
z7zQWj=N16<Fff=N*xW3zg^9VKuw$~7uoT<G7V(MOI44I5%fOg5!m^ArHqR1nVq`k-
UbF!Rh2xGzKV$qfS$h?V60OdF|xc~qF

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 230d043..7f98f7b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,46 +1,46 @@
 version: "3.9"
 
 services:
-   postgres-db:
-      image: kartoza/postgis:12.0
-      ports:
-         - 5432:5432
-      volumes:
-         - postgres_data:/var/lib/postgresql
-         - ./custom-postgresql.conf:/etc/postgresql/12/main/postgresql.conf
-      environment:
-         - POSTGRES_USER=${POSTGRES_USER}
-         - POSTGRES_PASS=${POSTGRES_PASS}
-         - POSTGRES_DBNAME=${POSTGRES_DBNAME}
-         - POSTGRES_MAX_CONNECTIONS=600
+  # postgres-db:
+  #    image: kartoza/postgis:12.0
+  #    ports:
+  #       - 5432:5432
+  #    volumes:
+  #       - postgres_data:/var/lib/postgresql
+  #       - ./custom-postgresql.conf:/etc/postgresql/12/main/postgresql.conf
+  #    environment:
+  #       - POSTGRES_USER=${POSTGRES_USER}
+  #       - POSTGRES_PASS=${POSTGRES_PASS}
+  #       - POSTGRES_DBNAME=${POSTGRES_DBNAME}
+  #       - POSTGRES_MAX_CONNECTIONS=600
 
-      restart: "on-failure"
-      networks:
-         - rog-api
-         
-   api:
-      build:
-         context: .
-         dockerfile: Dockerfile.gdal
-      command: python3 manage.py runserver 0.0.0.0:8100
-      volumes:
-         - .:/app
-      ports:
-        - 8100:8100
-      env_file:
-         - .env
-      restart: "on-failure"
-      depends_on:
-         - postgres-db
-      networks:
-         - rog-api
-      #entrypoint: ["/app/wait-for.sh", "postgres-db:5432", "--", ""]
-      #command: python3 manage.py runserver 0.0.0.0:8100
+  #    restart: "on-failure"
+  #    networks:
+  #       - rog-api
+
+  api:
+    build:
+      context: .
+      dockerfile: Dockerfile.gdal
+    command: python3 manage.py runserver 0.0.0.0:8100
+    volumes:
+      - .:/app
+    ports:
+      - 8100:8100
+    env_file:
+      - .env
+    restart: "on-failure"
+    depends_on:
+      - postgres-db
+    networks:
+      - rog-api
+    #entrypoint: ["/app/wait-for.sh", "postgres-db:5432", "--", ""]
+    #command: python3 manage.py runserver 0.0.0.0:8100
 
 networks:
-   rog-api:
-      driver: bridge
+  rog-api:
+    driver: bridge
 
 volumes:
-   postgres_data:
-   geoserver-data:
\ No newline at end of file
+  postgres_data:
+  geoserver-data:
diff --git a/rog/backend.py b/rog/backend.py
index 484c433..9ad342b 100644
--- a/rog/backend.py
+++ b/rog/backend.py
@@ -2,6 +2,7 @@ from django.conf import settings
 #from django.contrib.auth import get_user_model
 from .models import CustomUser
 from django.contrib.auth.backends import ModelBackend
+from django.contrib.auth import get_user_model
 
 class EmailOrUsernameModelBackend(ModelBackend):
     """
diff --git a/rog/models.py b/rog/models.py
index b7599d1..5937134 100644
--- a/rog/models.py
+++ b/rog/models.py
@@ -65,29 +65,32 @@ def remove_bom_inplace(path):
 class CustomUserManager(BaseUserManager):
     
     def create_user(self, email, password, group, event_code, team_name, **other_fields):
-
         if not email:
             raise ValueError(_("You must provide an email address"))
-
-        # email = self.normalize_email(email)
-        user=self.model(email=email, group=group, event_code=event_code, team_name=team_name, zekken_number=email, is_rogaining=True, **other_fields)
+        
+        user = self.model(email=email, group=group, event_code=event_code, team_name=team_name, zekken_number=email, is_rogaining=True, **other_fields)
         user.set_password(password)
         user.save()
 
         return user
 
+    def create_superuser(self, email, password, group, event_code=None, team_name=None, **other_fields):
+        # Providing default values for event_code and team_name if they are not provided
+        if event_code is None:
+            event_code = 'test'  # replace this with some default value
+        if team_name is None:
+            team_name = 'test'  # replace this with some default value
 
-    def create_superuser(self, email, password, group, **other_fields):
         other_fields.setdefault('is_staff', True)
         other_fields.setdefault('is_superuser', True)
         other_fields.setdefault('is_active', True)
 
         if other_fields.get('is_staff') is not True:
-            raise ValueError(_('Supperuser must assigned to staff'))
+            raise ValueError(_('Superuser must be assigned to staff'))
         if other_fields.get('is_superuser') is not True:
-            raise ValueError(_('Supperuser must assigned to superuser=True'))
+            raise ValueError(_('Superuser must have is_superuser set to True'))
 
-        return self.create_user(email, password, group, **other_fields)
+        return self.create_user(email, password, group, event_code, team_name, **other_fields)
 
 
 
diff --git a/rog/views.py b/rog/views.py
index 51e4783..fadeda5 100644
--- a/rog/views.py
+++ b/rog/views.py
@@ -273,6 +273,7 @@ class RegistrationAPI(generics.GenericAPIView):
             "token": AuthToken.objects.create(user)[1]
         })
 
+
 class LoginAPI(generics.GenericAPIView):
     serializer_class = LoginUserSerializer
 
@@ -337,6 +338,15 @@ class CheckinImageViewSet(viewsets.ModelViewSet):
     #     else:
     #         queryset = Incident.objects.filter(is_approved=True)
         return queryset
+    
+
+class RetrieveUserView(generics.RetrieveAPIView):
+    queryset = CustomUser.objects.all()
+    serializer_class = UserSerializer
+    permission_classes = [IsAuthenticated]
+
+    def get_object(self):
+        return self.request.user
 
 
 def userDetials(request):