resolve stash conflict issues

backend/paycheck_core/requirements/base.txt

@@ -23,6 +23,7 @@ django==5.0.6
     #   -r backend/paycheck_core/requirements/base.in
     #   django-cors-headers
     #   django-extensions
+    #   django-model-utils
     #   django-phone-field
     #   djangorestframework
     #   djangorestframework-simplejwt
@@ -31,6 +32,8 @@ django-cors-headers==4.3.1
     # via -r backend/paycheck_core/requirements/base.in
 django-extensions==3.2.3
     # via -r backend/paycheck_core/requirements/base.in
+django-model-utils==4.5.0
+    # via -r backend/paycheck_core/requirements/base.in
 django-phone-field==1.8.1
     # via -r backend/paycheck_core/requirements/base.in
 djangorestframework==3.15.1

backend/paycheck_core/requirements/dev.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --output-file=backend/paycheck/requirements/dev.txt backend/paycheck/requirements/dev.in
+#    pip-compile --output-file=backend/paycheck_core/requirements/dev.txt backend/paycheck_core/requirements/dev.in
 #
 asgiref==3.8.1
     # via django
@@ -11,7 +11,7 @@ asttokens==2.4.1
 autopep8==1.6.0
     # via django-silk
 black==22.3.0
-    # via -r backend/paycheck/requirements/dev.in
+    # via -r backend/paycheck_core/requirements/dev.in
 click==8.1.7
     # via black
 coverage[toml]==7.4.4
@@ -22,35 +22,46 @@ decorator==5.1.1
     #   ipython
 django==5.0.3
     # via
-    #   -c backend/paycheck/requirements/base.in
+    #   -c backend/paycheck_core/requirements/base.in
+    #   django-debug-toolbar
+    #   django-extensions
     #   django-silk
+django-debug-toolbar==4.4.2
+    # via -r backend/paycheck_core/requirements/dev.in
+django-extensions==3.2.3
+    # via
+    #   -c backend/paycheck_core/requirements/base.in
+    #   -r backend/paycheck_core/requirements/dev.in
 django-silk==5.1.0
-    # via -r backend/paycheck/requirements/dev.in
+    # via -r backend/paycheck_core/requirements/dev.in
 exceptiongroup==1.2.0
     # via
     #   ipython
     #   pytest
 executing==2.0.1
     # via stack-data
+factory-boy==3.3.0
+    # via -r backend/paycheck_core/requirements/dev.in
 faker==24.3.0
-    # via -r backend/paycheck/requirements/dev.in
+    # via
+    #   -r backend/paycheck_core/requirements/dev.in
+    #   factory-boy
 flake8==4.0.1
-    # via -r backend/paycheck/requirements/dev.in
+    # via -r backend/paycheck_core/requirements/dev.in
 gprof2dot==2022.7.29
     # via django-silk
 iniconfig==2.0.0
     # via pytest
 ipdb==0.13.13
-    # via -r backend/paycheck/requirements/dev.in
+    # via -r backend/paycheck_core/requirements/dev.in
 ipython==8.22.2
     # via ipdb
 isort==5.10.1
-    # via -r backend/paycheck/requirements/dev.in
+    # via -r backend/paycheck_core/requirements/dev.in
 jedi==0.19.1
     # via ipython
 matplotlib-inline==0.1.6
     # via ipython
-
 mccabe==0.6.1
     # via flake8
 mypy-extensions==1.0.0
@@ -83,12 +94,13 @@ pygments==2.17.2
     # via ipython
 pytest==8.1.1
     # via
+    #   -r backend/paycheck_core/requirements/dev.in
     #   pytest-cov
     #   pytest-django
 pytest-cov==3.0.0
-    # via -r backend/paycheck/requirements/dev.in
+    # via -r backend/paycheck_core/requirements/dev.in
 pytest-django==4.8.0
-    # via -r backend/paycheck/requirements/dev.in
+    # via -r backend/paycheck_core/requirements/dev.in
 python-dateutil==2.9.0.post0
     # via faker
 six==1.16.0
@@ -98,6 +110,7 @@ six==1.16.0
 sqlparse==0.4.4
     # via
     #   django
+    #   django-debug-toolbar
     #   django-silk
 stack-data==0.6.3
     # via ipython

backend/paycheck_core/src/paycheck/core/serializers.py

@@ -1,13 +1,11 @@
-from rest_framework import serializers
+from src.paycheck.core.models import UserProfile
 from django.conf import settings
+from rest_framework import serializers
 
 User = settings.AUTH_USER_MODEL
 
-from src.paycheck.core.models import UserProfile
-
 
 class UserSerializer(serializers.ModelSerializer):
-
     class Meta:
         model = User
 

docker-compose.dev.yml

@@ -1,5 +1,3 @@
-version: '3.9'
-
 #  Environment variables
 #  ####################################################################################################
 #  # READ ME FIRST!
@@ -10,6 +8,20 @@ version: '3.9'
 # #
 # ####################################################################################################
 
-
 services:
+  paycheck_db:
+    image: paycheck-core-db-dev:latest
+    container_name:  paycheeck_dev_db
+    context: backend/paycheck/docker
+    ports:
+      - "8080:8080"
+    environment:
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_DB}
+    volumes:
+      - paycheck_dev_db:/var/lib/
+
 
+volumes:
+  paycheck_db: