Merge pull request #34 from 50-Course/dev

user module update

.gitattributes

@@ -0,0 +1 @@
+* text=auto

backend/paycheck/paycheck

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from paycheck.manage import main
+from src.paycheck.manage import main
 
 if __name__ == "__main__":
     main()

backend/paycheck/requirements/dev.in

@@ -8,3 +8,4 @@ pytest-cov==3.0.0
 black==22.3.0
 flake8==4.0.1
 isort==5.10.1
+factory-boy

backend/paycheck/src/paycheck/IAM/models.py

@@ -24,6 +24,21 @@ def get_queryset(self) -> models.QuerySet:
 
 
 class User(AbstractUser):
+    first_name = models.CharField(
+        _("First Name"),
+        help_text="Given name of the user",
+        max_length=40,
+        blank=False,
+        null=False,
+    )
+    last_name = models.CharField(
+        _("Last Name"),
+        help_text="Surname of the user",
+        max_length=40,
+        blank=False,
+        null=False,
+    )
+
     REQUIRED_FIELDS = ["email"]
     USERNAME_FIELD = "email"
 
@@ -91,7 +106,48 @@ class UserType(models.TextChoices):
     )
 
     def full_name(self) -> str:
-        return f"{self.user.first_name} {self.user.last_name}"
+        return f"{self.user}"
 
     def __str__(self) -> str:
         return f"{self.full_name()} - {self.user_type}"
+
+
+class SupportUser(models.Model):
+    """
+    Represent a member of the support team.
+
+    SupportUser is someone who is an admin with limited access to the system
+
+    They can:
+        - Manage disputes and resolutions on behalf of the user
+        - Manage user accounts
+    """
+
+    user = models.OneToOneField(
+        _("Support"),
+        on_delete=models.CASCADE,
+        related_name="support_user",
+        help_text=_("Support User"),
+    )
+
+
+class AdminUser(models.Model):
+    """
+    Represent an admin user.
+
+    AdminUser is someone who is an admin with full access to the system
+
+    They can:
+        - Manage disputes and resolutions on behalf of the user
+        - Manage user accounts -blacklist or whitelist a user
+        - Manage user support staff
+        - Manage user support staff accounts
+        - Manage user support staff permissions
+    """
+
+    user = models.OneToOneField(
+        _("Admin User"),
+        on_delete=models.CASCADE,
+        related_name="admin_user",
+        help_text=_("Admin User"),
+    )

backend/paycheck/src/paycheck/config/settings/production.py

@@ -4,3 +4,14 @@
 CACHES = {}
 CACHES["default"]["BACKEND"] = "django.core.cache.backends.redis.RedisCache"
 CACHES["default"]["OPTIONS"] = None
+
+DATABASES["default"]["NAME"] = "paycheck-core-prod"
+DATABASES["default"]["HOST"] = "paycheck-core-prod"
+DATABASES["default"]["USER"] = "paycheck-core-prod"
+DATABASES["default"]["PORT"] = 5432
+DATABASES["default"]["PASSWORD"] = "paycheck-core-prod"
+DATABASES["default"]["OPTIONS"] = {}
+
+DEBUG = False
+
+INSTALLED_APPS += []

docker-compose.dev.yml

@@ -0,0 +1,15 @@
+version: '3.9'
+
+#  Environment variables
+#  ####################################################################################################
+#  # READ ME FIRST!
+#  #
+#  # ATTENTION: This file is used to build the docker image and run the container in development mode
+#
+# #           For guide on how to run the application in development mode, see the README.md file
+# #
+# ####################################################################################################
+
+
+services:
+