Merge pull request #5506 from akolson/dup-recs-endpoint-names

Renames dupilicate recommendations endpoint names

Author: bjester

contentcuration/contentcuration/frontend/shared/feedbackApiUtils.js

@@ -12,9 +12,9 @@ export const FeedbackTypeOptions = {
   flagged: 'FLAGGED',
 };
 
-export const FLAG_FEEDBACK_EVENT_ENDPOINT = 'flagged';
-export const RECOMMENDATION_EVENT_ENDPOINT = 'recommendations';
-export const RECOMMENDATION_INTERACTION_EVENT_ENDPOINT = 'recommendations-interaction';
+export const FLAG_FEEDBACK_EVENT_ENDPOINT = 'flagged-events';
+export const RECOMMENDATION_EVENT_ENDPOINT = 'recommendations-events';
+export const RECOMMENDATION_INTERACTION_EVENT_ENDPOINT = 'recommendations-interaction-events';
 
 /**
  * @typedef {Object} BaseFeedbackParams

contentcuration/contentcuration/tests/viewsets/test_flagged.py

@@ -34,7 +34,7 @@ def test_create_flag_event(self):
         self.client.force_authenticate(user=self.user)
         flagged_content = self.flag_feedback_object
         response = self.client.post(
-            reverse("flagged-list"),
+            reverse("flagged-events-list"),
             flagged_content,
             format="json",
         )
@@ -46,7 +46,7 @@ def test_create_flag_event_fails_for_flag_test_dev_feature_disabled(self):
         self.user.save()
         self.client.force_authenticate(user=self.user)
         response = self.client.post(
-            reverse("flagged-list"),
+            reverse("flagged-events-list"),
             flagged_content,
             format="json",
         )
@@ -58,7 +58,7 @@ def test_create_flag_event_fails_for_flag_test_dev_feature_None(self):
         self.user.save()
         self.client.force_authenticate(user=self.user)
         response = self.client.post(
-            reverse("flagged-list"),
+            reverse("flagged-events-list"),
             flagged_content,
             format="json",
         )
@@ -67,7 +67,7 @@ def test_create_flag_event_fails_for_flag_test_dev_feature_None(self):
     def test_create_flag_event_fails_for_unauthorized_user(self):
         flagged_content = self.flag_feedback_object
         response = self.client.post(
-            reverse("flagged-list"),
+            reverse("flagged-events-list"),
             flagged_content,
             format="json",
         )
@@ -77,7 +77,7 @@ def test_list_flagged_content_super_admin(self):
         self.user.is_admin = True
         self.user.save()
         self.client.force_authenticate(self.user)
-        response = self.client.get(reverse("flagged-list"), format="json")
+        response = self.client.get(reverse("flagged-events-list"), format="json")
         self.assertEqual(response.status_code, 200, response.content)
 
     def test_retreive_fails_for_normal_user(self):
@@ -94,18 +94,18 @@ def test_retreive_fails_for_normal_user(self):
             user=self.user,
         )
         response = self.client.get(
-            reverse("flagged-detail", kwargs={"pk": flag_feedback_object.id}),
+            reverse("flagged-events-detail", kwargs={"pk": flag_feedback_object.id}),
             format="json",
         )
         self.assertEqual(response.status_code, 403, response.content)
 
     def test_list_fails_for_normal_user(self):
         self.client.force_authenticate(user=self.user)
-        response = self.client.get(reverse("flagged-list"), format="json")
+        response = self.client.get(reverse("flagged-events-list"), format="json")
         self.assertEqual(response.status_code, 403, response.content)
 
     def test_list_fails_for_user_dev_feature_enabled(self):
-        response = self.client.get(reverse("flagged-list"), format="json")
+        response = self.client.get(reverse("flagged-events-list"), format="json")
         self.assertEqual(response.status_code, 403, response.content)
 
     def test_destroy_flagged_content_super_admin(self):
@@ -124,7 +124,7 @@ def test_destroy_flagged_content_super_admin(self):
             user=self.user,
         )
         response = self.client.delete(
-            reverse("flagged-detail", kwargs={"pk": flag_feedback_object.id}),
+            reverse("flagged-events-detail", kwargs={"pk": flag_feedback_object.id}),
             format="json",
         )
         self.assertEqual(response.status_code, 204, response.content)
@@ -145,7 +145,7 @@ def test_destroy_flagged_content_fails_for_user_with_feature_flag_disabled(self)
             user=self.user,
         )
         response = self.client.delete(
-            reverse("flagged-detail", kwargs={"pk": flag_feedback_object.id}),
+            reverse("flagged-events-detail", kwargs={"pk": flag_feedback_object.id}),
             format="json",
         )
         self.assertEqual(response.status_code, 403, response.content)

contentcuration/contentcuration/tests/viewsets/test_recommendations.py

@@ -186,14 +186,16 @@ def setUp(self):
     def test_create_recommendations_event(self):
         recommendations_event = self.recommendations_event_object
         response = self.client.post(
-            reverse("recommendations-list"),
+            reverse("recommendations-events-list"),
             recommendations_event,
             format="json",
         )
         self.assertEqual(response.status_code, 201, response.content)
 
     def test_list_fails(self):
-        response = self.client.get(reverse("recommendations-list"), format="json")
+        response = self.client.get(
+            reverse("recommendations-events-list"), format="json"
+        )
         self.assertEqual(response.status_code, 405, response.content)
 
     def test_retrieve_fails(self):
@@ -214,7 +216,9 @@ def test_retrieve_fails(self):
             user=self.user,
         )
         response = self.client.get(
-            reverse("recommendations-detail", kwargs={"pk": recommendations_event.id}),
+            reverse(
+                "recommendations-events-detail", kwargs={"pk": recommendations_event.id}
+            ),
             format="json",
         )
         self.assertEqual(response.status_code, 405, response.content)
@@ -242,7 +246,9 @@ def test_update_recommendations_event(self):
             "breadcrumbs": "#Title#->Updated",
         }
         response = self.client.put(
-            reverse("recommendations-detail", kwargs={"pk": recommendations_event.id}),
+            reverse(
+                "recommendations-events-detail", kwargs={"pk": recommendations_event.id}
+            ),
             updated_data,
             format="json",
         )
@@ -266,7 +272,9 @@ def test_partial_update_recommendations_event(self):
             user=self.user,
         )
         response = self.client.patch(
-            reverse("recommendations-detail", kwargs={"pk": recommendations_event.id}),
+            reverse(
+                "recommendations-events-detail", kwargs={"pk": recommendations_event.id}
+            ),
             {"context": {"model_version": 2}},
             format="json",
         )
@@ -290,7 +298,9 @@ def test_destroy_recommendations_event(self):
             user=self.user,
         )
         response = self.client.delete(
-            reverse("recommendations-detail", kwargs={"pk": recommendations_event.id}),
+            reverse(
+                "recommendations-events-detail", kwargs={"pk": recommendations_event.id}
+            ),
             format="json",
         )
         self.assertEqual(response.status_code, 405, response.content)
@@ -345,7 +355,7 @@ def setUp(self):
     def test_create_recommendations_interaction(self):
         recommendations_interaction = self.recommendations_interaction_object
         response = self.client.post(
-            reverse("recommendations-interaction-list"),
+            reverse("recommendations-interaction-events-list"),
             recommendations_interaction,
             format="json",
         )
@@ -371,7 +381,7 @@ def test_bulk_create_recommendations_interaction(self):
             },
         ]
         response = self.client.post(
-            reverse("recommendations-interaction-list"),
+            reverse("recommendations-interaction-events-list"),
             recommendations_interactions,
             format="json",
         )
@@ -399,7 +409,7 @@ def test_bulk_create_recommendations_interaction_failure(self):
             },
         ]
         response = self.client.post(
-            reverse("recommendations-interaction-list"),
+            reverse("recommendations-interaction-events-list"),
             recommendations_interactions,
             format="json",
         )
@@ -408,7 +418,7 @@ def test_bulk_create_recommendations_interaction_failure(self):
 
     def test_list_fails(self):
         response = self.client.get(
-            reverse("recommendations-interaction-list"), format="json"
+            reverse("recommendations-interaction-events-list"), format="json"
         )
         self.assertEqual(response.status_code, 405, response.content)
 
@@ -423,7 +433,7 @@ def test_retrieve_fails(self):
         )
         response = self.client.get(
             reverse(
-                "recommendations-interaction-detail",
+                "recommendations-interaction-events-detail",
                 kwargs={"pk": recommendations_interaction.id},
             ),
             format="json",
@@ -443,7 +453,7 @@ def test_update_recommendations_interaction(self):
         updated_data["feedback_type"] = "PREVIEWED"
         response = self.client.put(
             reverse(
-                "recommendations-interaction-detail",
+                "recommendations-interaction-events-detail",
                 kwargs={"pk": recommendations_interaction.id},
             ),
             updated_data,
@@ -462,7 +472,7 @@ def test_partial_update_recommendations_interaction(self):
         )
         response = self.client.patch(
             reverse(
-                "recommendations-interaction-detail",
+                "recommendations-interaction-events-detail",
                 kwargs={"pk": recommendations_interaction.id},
             ),
             {"feedback_type": "IMPORTED"},
@@ -481,7 +491,7 @@ def test_destroy_recommendations_interaction(self):
         )
         response = self.client.delete(
             reverse(
-                "recommendations-interaction-detail",
+                "recommendations-interaction-events-detail",
                 kwargs={"pk": recommendations_interaction.id},
             ),
             format="json",

contentcuration/contentcuration/urls.py

@@ -76,14 +76,16 @@ def get_redirect_url(self, *args, **kwargs):
 router.register(r"assessmentitem", AssessmentItemViewSet)
 router.register(r"admin-users", AdminUserViewSet, basename="admin-users")
 router.register(r"clipboard", ClipboardViewSet, basename="clipboard")
-router.register(r"flagged", FlagFeedbackEventViewSet, basename="flagged")
+router.register(r"events/flagged", FlagFeedbackEventViewSet, basename="flagged-events")
 router.register(
-    r"recommendations", RecommendationsEventViewSet, basename="recommendations"
+    r"events/recommendations",
+    RecommendationsEventViewSet,
+    basename="recommendations-events",
 )
 router.register(
-    r"recommendationsinteraction",
+    r"events/recommendationsinteraction",
     RecommendationsInteractionEventViewSet,
-    basename="recommendations-interaction",
+    basename="recommendations-interaction-events",
 )
 
 urlpatterns = [