Create table project_program_area_xref

app/Dockerfile

@@ -20,11 +20,11 @@ RUN \
   apt-get update \
   && apt-get install --no-install-recommends -yqq \
   netcat=1.10-46 \
-  gcc=4:10.2.1-1 \
-  graphviz=2.42.2-5
+  gcc=4:10.2.1-1
 
-# install dependencies
+# Copy requirements file
 COPY ./requirements.txt .
+
 # hadolint ignore=DL3042
 RUN \
   --mount=type=cache,target=/root/.cache \

app/core/admin.py

@@ -16,6 +16,7 @@
 from .models import PracticeArea
 from .models import ProgramArea
 from .models import Project
+from .models import ProjectProgramAreaXref
 from .models import Sdg
 from .models import Skill
 from .models import StackElementType
@@ -123,6 +124,15 @@ class ProjectAdmin(admin.ModelAdmin):
     )
 
 
+@admin.register(ProjectProgramAreaXref)
+class ProjectProgramAreaXrefAdmin(admin.ModelAdmin):
+    list_display = (
+        "project_id",
+        "program_area_id",
+        "created_date",
+    )
+
+
 @admin.register(Event)
 class EventAdmin(admin.ModelAdmin):
     list_display = (

app/core/api/serializers.py

@@ -12,6 +12,7 @@
 from core.models import PracticeArea
 from core.models import ProgramArea
 from core.models import Project
+from core.models import ProjectProgramAreaXref
 from core.models import Sdg
 from core.models import Skill
 from core.models import StackElementType
@@ -328,3 +329,14 @@ class Meta:
         model = CheckType
         fields = ("uuid", "name", "description")
         read_only_fields = ("uuid", "created_at", "updated_at")
+
+
+class ProjectProgramAreaXrefSerializer(serializers.ModelSerializer):
+    """
+    Used to retrieve ProjectProgramAreaXref
+    """
+
+    class Meta:
+        model = ProjectProgramAreaXref
+        fields = ("uuid", "project_id", "program_area_id", "created_date")
+        read_only_fields = ("uuid", "created_date")

app/core/api/urls.py

@@ -11,6 +11,7 @@
 from .views import PermissionTypeViewSet
 from .views import PracticeAreaViewSet
 from .views import ProgramAreaViewSet
+from .views import ProjectProgramAreaXrefViewSet
 from .views import ProjectViewSet
 from .views import SdgViewSet
 from .views import SkillViewSet
@@ -42,6 +43,12 @@
     basename="affiliation",
 )
 router.register(r"check-types", CheckTypeViewSet, basename="check-type")
+router.register(
+    r"project-program-area-xrefs",
+    ProjectProgramAreaXrefViewSet,
+    basename="project-program-area-xref",
+)
+
 urlpatterns = [
     path("me/", UserProfileAPIView.as_view(), name="my_profile"),
 ]

app/core/api/views.py

@@ -22,6 +22,7 @@
 from ..models import PracticeArea
 from ..models import ProgramArea
 from ..models import Project
+from ..models import ProjectProgramAreaXref
 from ..models import Sdg
 from ..models import Skill
 from ..models import StackElementType
@@ -36,6 +37,7 @@
 from .serializers import PermissionTypeSerializer
 from .serializers import PracticeAreaSerializer
 from .serializers import ProgramAreaSerializer
+from .serializers import ProjectProgramAreaXrefSerializer
 from .serializers import ProjectSerializer
 from .serializers import SdgSerializer
 from .serializers import SkillSerializer
@@ -346,3 +348,19 @@ class CheckTypeViewSet(viewsets.ModelViewSet):
     permission_classes = [IsAuthenticated]
     queryset = CheckType.objects.all()
     serializer_class = CheckTypeSerializer
+
+
+@extend_schema_view(
+    list=extend_schema(description="Return a list of all project program area xref"),
+    create=extend_schema(description="Create a new project program area xref"),
+    retrieve=extend_schema(
+        description="Return the details of a project program area xref"
+    ),
+    destroy=extend_schema(description="Delete a project program area xref"),
+    update=extend_schema(description="Update a project program area xref"),
+    partial_update=extend_schema(description="Patch a project program area xref"),
+)
+class ProjectProgramAreaXrefViewSet(viewsets.ModelViewSet):
+    permission_classes = [IsAuthenticated]
+    queryset = ProjectProgramAreaXref.objects.all()
+    serializer_class = ProjectProgramAreaXrefSerializer

app/core/migrations/0025_projectprogramareaxref.py

@@ -0,0 +1,60 @@
+# Generated by Django 4.2.11 on 2024-08-29 19:28
+
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0024_checktype"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="ProjectProgramAreaXref",
+            fields=[
+                (
+                    "uuid",
+                    models.UUIDField(
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                        unique=True,
+                    ),
+                ),
+                (
+                    "created_at",
+                    models.DateTimeField(auto_now_add=True, verbose_name="Created at"),
+                ),
+                (
+                    "updated_at",
+                    models.DateTimeField(auto_now=True, verbose_name="Updated at"),
+                ),
+                (
+                    "created_date",
+                    models.DateTimeField(
+                        blank=True, null=True, verbose_name="Created at"
+                    ),
+                ),
+                (
+                    "program_area_id",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="core.programarea",
+                    ),
+                ),
+                (
+                    "project_id",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="core.project"
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+    ]

app/core/migrations/max_migration.txt

@@ -1 +1 @@
-0024_checktype
+0025_projectprogramareaxref

app/core/models.py

@@ -383,3 +383,12 @@ class CheckType(AbstractBaseModel):
 
     def __str__(self):
         return f"{self.name}"
+
+
+class ProjectProgramAreaXref(AbstractBaseModel):
+    project_id = models.ForeignKey(Project, on_delete=models.CASCADE)
+    program_area_id = models.ForeignKey(ProgramArea, on_delete=models.CASCADE)
+    created_date = models.DateTimeField("Created at", null=True, blank=True)
+
+    def __str__(self):
+        return f"Project Id: {self.project_id}, Program area Id: {self.program_area_id}"

app/core/tests/test_api.py

@@ -24,6 +24,8 @@
 SDG_URL = reverse("sdg-list")
 AFFILIATION_URL = reverse("affiliation-list")
 CHECK_TYPE_URL = reverse("check-type-list")
+PROJECT_PROGRAM_AREA_XREF_URL = reverse("project-program-area-xref-list")
+
 
 CREATE_USER_PAYLOAD = {
     "username": "TestUserAPI",
@@ -357,3 +359,17 @@ def test_create_check_type(auth_client):
     res = auth_client.post(CHECK_TYPE_URL, payload)
     assert res.status_code == status.HTTP_201_CREATED
     assert res.data["name"] == payload["name"]
+
+
+def test_create_project_program_area_xref(auth_client, project, program_area):
+    """Test that we can create a project program area xref"""
+
+    payload = {
+        "project_id": project.uuid,
+        "program_area_id": program_area.uuid,
+        "created_date": "2024-08-30 02:34:00",
+    }
+    res = auth_client.post(PROJECT_PROGRAM_AREA_XREF_URL, payload)
+    assert res.status_code == status.HTTP_201_CREATED
+    assert res.data["project_id"] == payload["project_id"]
+    assert res.data["program_area_id"] == payload["program_area_id"]

app/core/tests/test_models.py

@@ -1,6 +1,10 @@
 import pytest
+from django.test import TestCase
 
 from ..models import Event
+from ..models import ProgramArea
+from ..models import Project
+from ..models import ProjectProgramAreaXref
 
 pytestmark = pytest.mark.django_db
 
@@ -118,3 +122,51 @@ def test_affiliation_is_neither_partner_and_sponsor(affiliation4):
 def test_check_type(check_type):
     assert str(check_type) == "This is a test check_type."
     assert check_type.description == "This is a test check_type description."
+
+
+class ProjectProgramAreaXrefTestCase(TestCase):
+    def setUp(self):
+        # retrieve the objects from the DB
+        self.program_area1 = ProgramArea.objects.get(name="Workforce Development")
+        self.program_area2 = ProgramArea.objects.get(name="Civic Tech Infrastructure")
+
+        # Create a Project object
+        self.project = Project.objects.create(name="Hack for LA Site")
+
+        # Create ProjectProgramAreaXref objects to link the project to program areas
+        self.project_program_area_xref1 = ProjectProgramAreaXref.objects.create(
+            project_id=self.project,
+            program_area_id=self.program_area1,
+            created_date="2024-08-30 02:34:00",
+        )
+        self.project_program_area_xref2 = ProjectProgramAreaXref.objects.create(
+            project_id=self.project,
+            program_area_id=self.program_area2,
+            created_date="2024-08-30 02:34:00",
+        )
+
+    def test_project_to_program_areas_relationship(self):
+        # Get all ProgramAreas associated with the project
+        program_areas = ProgramArea.objects.filter(
+            projectprogramareaxref__project_id=self.project
+        )
+        assert program_areas.count() == 2
+        # check if program_area1 is included in the retrieved program_areas
+        assert self.program_area1 in program_areas
+        assert self.program_area2 in program_areas
+
+    def test_program_area_to_projects_relationship(self):
+        # Get all Projects associated with the first ProgramArea
+        projects_for_area1 = Project.objects.filter(
+            projectprogramareaxref__program_area_id=self.program_area1
+        )
+        assert projects_for_area1.count() == 1
+        # asserts that self.project is included in the retrieved projects_for_area1
+        assert self.project in projects_for_area1
+
+        # Get all Projects associated with the second ProgramArea
+        projects_for_area2 = Project.objects.filter(
+            projectprogramareaxref__program_area_id=self.program_area2
+        )
+        assert projects_for_area2.count() == 1
+        assert self.project in projects_for_area2