Merge remote-tracking branch 'origin/main' into feature/url-status-type

Author: Ruchitha12

app/core/api/serializers.py

@@ -508,15 +508,16 @@ class ProjectStackElementXrefSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = ProjectStackElementXref
-        fields = [
+        fields = (
             "uuid",
             "project",
             "project_name",
             "stack_element",
             "stack_element_name",
             "created_at",
             "updated_at",
-        ]
+        )
+        read_only_fields = ("uuid", "created_at", "updated_at")
 
 
 class UrlStatusTypeSerializer(serializers.ModelSerializer):

app/core/api/urls.py

@@ -71,7 +71,7 @@
 router.register(
     r"project-stack-elements",
     ProjectStackElementXrefViewSet,
-    basename="project-stack-elements",
+    basename="project-stack-element",
 )
 router.register(r"url-status-types", UrlStatusTypeViewSet, basename="url-status-type")
 urlpatterns = [

app/core/api/views.py

@@ -528,9 +528,9 @@ class ProjectUrlViewSet(viewsets.ModelViewSet):
 
 
 class ProjectStackElementXrefViewSet(viewsets.ModelViewSet):
+    permission_classes = [IsAuthenticated]
     queryset = ProjectStackElementXref.objects.all()
     serializer_class = ProjectStackElementXrefSerializer
-    permission_classes = [IsAuthenticatedOrReadOnly]
 
 
 @extend_schema_view(

app/core/models.py

@@ -392,8 +392,6 @@ class StackElementType(AbstractBaseModel):
     name = models.CharField(max_length=255)
     description = models.TextField(blank=True)
 
-    # PK of this model is the ForeignKey for stack_element
-
     def __str__(self):
         return f"{self.name}"
 
@@ -410,9 +408,6 @@ class StackElement(AbstractBaseModel):
     active = models.BooleanField(null=True)
     element_type = models.ForeignKey(StackElementType, on_delete=models.CASCADE)
 
-    # PK of this model is the ForeignKey for project_stack_element_xref
-    # we might be able to use the builtin django many-to-many relation that manages the xref table automatically
-
     class Meta:
         verbose_name_plural = "Stack Elements"
 

app/core/tests/test_api.py

@@ -43,7 +43,7 @@
 SOC_MAJOR_URL = reverse("soc-major-list")
 SOC_MINORS_URL = reverse("soc-minor-list")
 URL_TYPE_URL = reverse("url-type-list")
-PROJECT_STACK_ELEMENTS_URL = reverse("project-stack-elements-list")
+PROJECT_STACK_ELEMENTS_URL = reverse("project-stack-element-list")
 URL_STATUS_TYPES_URL = reverse("url-status-type-list")
 
 CREATE_USER_PAYLOAD = {
@@ -644,7 +644,7 @@ def test_list_project_stack_elements(auth_client, project_stack_element_xref):
 
 def test_retrieve_project_stack_element(auth_client, project_stack_element_xref):
     url = reverse(
-        "project-stack-elements-detail", args=[project_stack_element_xref.uuid]
+        "project-stack-element-detail", args=[project_stack_element_xref.uuid]
     )
     res = auth_client.get(url)
 
@@ -659,7 +659,7 @@ def test_retrieve_project_stack_element(auth_client, project_stack_element_xref)
 
 def test_delete_project_stack_element(auth_client, project_stack_element_xref):
     url = reverse(
-        "project-stack-elements-detail", args=[project_stack_element_xref.uuid]
+        "project-stack-element-detail", args=[project_stack_element_xref.uuid]
     )
     res = auth_client.delete(url)
 
@@ -716,11 +716,11 @@ def test_project_stack_element_workflow(auth_client):
 
     # Link Project + StackElement
     link_payload = {"project": project_uuid, "stack_element": stack_element_uuid}
-    res_link = auth_client.post(reverse("project-stack-elements-list"), link_payload)
+    res_link = auth_client.post(reverse("project-stack-element-list"), link_payload)
     assert res_link.status_code == status.HTTP_201_CREATED
 
     # Verify link shows up
-    res_list = auth_client.get(reverse("project-stack-elements-list"))
+    res_list = auth_client.get(reverse("project-stack-element-list"))
     assert res_list.status_code == status.HTTP_200_OK
     assert len(res_list.data) == 1
     assert res_list.data[0]["project"] == project_uuid