better regex for ids with trailing slash in URL

CLIxIndia-Dev · Mar 28, 2018 · 76c5b9d · 76c5b9d
1 parent c01cd88
commit 76c5b9d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/assessment/assessment.py b/assessment/assessment.py
@@ -103,29 +103,29 @@
     "/banks/(.*)/assessmentstaken/(.*)/questions/(.*)/qti/?", "AssessmentTakenQuestionQTIDetails",
     "/banks/(.*)/assessmentstaken/(.*)/questions/(.*)/status/?", "AssessmentTakenQuestionStatus",
     "/banks/(.*)/assessmentstaken/(.*)/questions/(.*)/submit/?", "AssessmentTakenQuestionSubmit",
-    "/banks/(.*)/assessmentstaken/(.*)/questions/(.*)/?", "AssessmentTakenQuestionDetails",
+    "/banks/(.*)/assessmentstaken/(.*)/questions/(.*[^/])/?", "AssessmentTakenQuestionDetails",
     "/banks/(.*)/assessmentstaken/(.*)/questions/?", "AssessmentTakenQuestions",
     "/banks/(.*)/assessmentstaken/(.*)/finish/?", "FinishAssessmentTaken",
-    "/banks/(.*)/assessmentstaken/(.*)/?", "AssessmentTakenDetails",
+    "/banks/(.*)/assessmentstaken/(.*[^/])/?", "AssessmentTakenDetails",
     "/banks/(.*)/assessments/(.*)/assessmentsoffered/?", "AssessmentsOffered",
     "/banks/(.*)/assessmentsoffered/?", "AssessmentsOffered",
-    "/banks/(.*)/assessmentsoffered/(.*)/?", "AssessmentOfferedDetails",
-    "/banks/(.*)/assessments/(.*)/assignedbankids/(.*)/?", "AssessmentRemoveAssignedBankIds",
+    "/banks/(.*)/assessmentsoffered/(.*[^/])/?", "AssessmentOfferedDetails",
+    "/banks/(.*)/assessments/(.*)/assignedbankids/(.*[^/])/?", "AssessmentRemoveAssignedBankIds",
     "/banks/(.*)/assessments/(.*)/assignedbankids/?", "AssessmentAssignedBankIds",
-    "/banks/(.*)/assessments/(.*)/items/(.*)/?", "AssessmentItemDetails",
+    "/banks/(.*)/assessments/(.*)/items/(.*[^/])/?", "AssessmentItemDetails",
     "/banks/(.*)/assessments/(.*)/items/?", "AssessmentItemsList",
-    "/banks/(.*)/assessments/(.*)/?", "AssessmentDetails",
+    "/banks/(.*)/assessments/(.*[^/])/?", "AssessmentDetails",
     "/banks/(.*)/assessments/?", "AssessmentsList",
     "/banks/(.*)/items/(.*)/videoreplacement/?", "ItemVideoTagReplacement",
     "/banks/(.*)/items/(.*)/qti/?", "ItemQTIDetails",
-    "/banks/(.*)/items/(.*)/?", "ItemDetails",
+    "/banks/(.*)/items/(.*[^/])/?", "ItemDetails",
     "/banks/(.*)/items/?", "ItemsList",
     "/banks/(.*)/?", "AssessmentBankDetails",
     "/banks/?", "AssessmentBanksList",
-    "/hierarchies/roots/(.*)/?", "AssessmentHierarchiesRootDetails",
+    "/hierarchies/roots/(.*[^/])/?", "AssessmentHierarchiesRootDetails",
     "/hierarchies/roots/?", "AssessmentHierarchiesRootsList",
     "/hierarchies/nodes/(.*)/children/?", "AssessmentHierarchiesNodeChildrenList",
-    "/hierarchies/nodes/(.*)/?", "AssessmentHierarchiesNodeDetails"
+    "/hierarchies/nodes/(.*[^/])/?", "AssessmentHierarchiesNodeDetails"
 )
 
 

diff --git a/logging_/logging_.py b/logging_/logging_.py
@@ -18,9 +18,9 @@
 
 urls = (
     "/logs/?", "LogsList",
-    "/logs/(.*)/logentries/(.*)/?", "LogEntryDetails",
+    "/logs/(.*)/logentries/(.*[^/])/?", "LogEntryDetails",
     "/logs/(.*)/logentries/?", "LogEntriesList",
-    "/logs/(.*)/?", "LogDetails",
+    "/logs/(.*[^/])/?", "LogDetails",
     "/genericlog/?", "GenericLogEntries"
 )
 

diff --git a/repository/repository.py b/repository/repository.py
@@ -15,11 +15,11 @@
 
 urls = (
     "/repositories/(.*)/assets/(.*)/contents/(.*)/stream/?", "AssetContentStream",
-    "/repositories/(.*)/assets/(.*)/contents/(.*)/?", "AssetContentDetails",
+    "/repositories/(.*)/assets/(.*)/contents/(.*[^/])/?", "AssetContentDetails",
     "/repositories/(.*)/assets/(.*)/contents/?", "AssetContentsList",
-    "/repositories/(.*)/assets/(.*)/?", "AssetDetails",
+    "/repositories/(.*)/assets/(.*[^/])/?", "AssetDetails",
     "/repositories/(.*)/assets/?", "AssetsList",
-    "/repositories/(.*)/?", "RepositoryDetails",
+    "/repositories/(.*[^/])/?", "RepositoryDetails",
     "/repositories/?", "RepositoriesList"
 )