Create table project program area xref 45

app/core/api/serializers.py

@@ -101,6 +101,8 @@ class Meta:
 class ProjectSerializer(serializers.ModelSerializer):
     """Used to retrieve project info"""
 
+    program_areas = serializers.StringRelatedField(many=True)
+
     class Meta:
         model = Project
         fields = (
@@ -117,6 +119,7 @@ class Meta:
             "image_logo",
             "image_hero",
             "image_icon",
+            "program_areas",
         )
         read_only_fields = (
             "uuid",
@@ -227,9 +230,11 @@ class Meta:
 class ProgramAreaSerializer(serializers.ModelSerializer):
     """Used to retrieve program_area info"""
 
+    projects = serializers.StringRelatedField(many=True)
+
     class Meta:
         model = ProgramArea
-        fields = ("uuid", "name", "description", "image")
+        fields = ("uuid", "name", "description", "image", "projects")
         read_only_fields = ("uuid", "created_at", "updated_at")
 
 

app/core/migrations/0028_project_program_areas.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.11 on 2024-10-04 18:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0027_socmajor"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="project",
+            name="program_areas",
+            field=models.ManyToManyField(
+                blank=True, related_name="projects", to="core.programarea"
+            ),
+        ),
+    ]

app/core/migrations/max_migration.txt

@@ -1 +1 @@
-0027_socmajor
+0028_project_program_areas

app/core/models.py

@@ -144,6 +144,12 @@ class Project(AbstractBaseModel):
     image_logo = models.URLField(blank=True)
     image_hero = models.URLField(blank=True)
     image_icon = models.URLField(blank=True)
+    program_areas = models.ManyToManyField(
+        "ProgramArea",
+        related_name="projects",
+        blank=True,
+        # through="ProjectProgramAreaXref"
+    )
 
     def __str__(self):
         return f"{self.name}"

app/core/tests/test_api.py

@@ -22,6 +22,7 @@
 SKILL_URL = reverse("skill-list")
 STACK_ELEMENT_URL = reverse("stack-element-list")
 PERMISSION_TYPE = reverse("permission-type-list")
+PROJECT_URL = reverse("project-list")
 STACK_ELEMENT_TYPE_URL = reverse("stack-element-type-list")
 SDG_URL = reverse("sdg-list")
 AFFILIATION_URL = reverse("affiliation-list")
@@ -381,3 +382,17 @@ def test_create_soc_major(auth_client):
     res = auth_client.post(SOC_MAJOR_URL, payload)
     assert res.status_code == status.HTTP_201_CREATED
     assert res.data["title"] == payload["title"]
+
+
+def test_project_program_area_xref(auth_client, project, program_area):
+    project.program_areas.add(program_area)
+    project.save()
+
+    proj_res = auth_client.get(PROJECT_URL)
+    program_area_res = auth_client.get(PROGRAM_AREA_URL)
+
+    assert filter(lambda proj: str(proj["uuid"]) == str(project.pk), proj_res.data)
+    assert filter(
+        lambda _program_area: str(_program_area["uuid"]) == str(program_area.pk),
+        program_area_res,
+    )

app/core/tests/test_models.py

@@ -3,6 +3,8 @@
 import pytest
 
 from ..models import Event
+from ..models import ProgramArea
+from ..models import Project
 
 pytestmark = pytest.mark.django_db
 
@@ -145,3 +147,33 @@ def test_check_type(check_type):
 
 def test_soc_major(soc_major):
     assert str(soc_major) == "Test Soc Major"
+
+
+def test_project_program_area_relationship(project):
+    civic_tech_infrastructure_program_area = ProgramArea.objects.get(
+        name="Civic Tech Infrastructure"
+    )
+    workforce_program_area = ProgramArea.objects.get(name="Workforce Development")
+    hack_for_la_project = Project.objects.create(name="Hack for LA Site")
+    hack_for_la_project.program_areas.add(
+        civic_tech_infrastructure_program_area, workforce_program_area
+    )
+    assert hack_for_la_project.program_areas.count() == 2
+    assert hack_for_la_project.program_areas.contains(
+        civic_tech_infrastructure_program_area
+    )
+    assert hack_for_la_project.program_areas.contains(workforce_program_area)
+    assert civic_tech_infrastructure_program_area.projects.contains(hack_for_la_project)
+    assert workforce_program_area.projects.contains(hack_for_la_project)
+
+    hack_for_la_project.program_areas.remove(civic_tech_infrastructure_program_area)
+    assert hack_for_la_project.program_areas.count() == 1
+    assert not hack_for_la_project.program_areas.contains(
+        civic_tech_infrastructure_program_area
+    )
+    assert hack_for_la_project.program_areas.contains(workforce_program_area)
+
+    assert not civic_tech_infrastructure_program_area.projects.contains(
+        hack_for_la_project
+    )
+    assert workforce_program_area.projects.contains(hack_for_la_project)

scripts/createsuperuser.sh

@@ -8,5 +8,5 @@ set -x
 
 # This command requires the DJANGO_SUPERUSER_USERNAME and
 # DJANGO_SUPERUSER_PASSWORD environmental variables to be set when django starts
-echo "DJANGO_SUPERUSER_USERNAME: $DJANGO_SUPERUSER_USERNAME"
+# echo "DJANGO_SUPERUSER_USERNAME: $DJANGO_SUPERUSER_USERNAME"
 docker-compose exec web python manage.py createsuperuser --no-input