Change the naming algorithm for review documents a bit

 - Legacy-Id: 11635

Author: OleLaursen

ietf/doc/tests_review.py

@@ -401,7 +401,7 @@ def test_complete_review_upload_content(self):
         self.assertTrue(review_req.team.acronym.lower() in review_req.review.name)
         self.assertTrue(review_req.doc.rev in review_req.review.name)
 
-        with open(os.path.join(self.review_subdir, review_req.review.name + "-" + review_req.review.rev + ".txt")) as f:
+        with open(os.path.join(self.review_subdir, review_req.review.name + ".txt")) as f:
             self.assertEqual(f.read(), "This is a review\nwith two lines")
 
         self.assertEqual(len(outbox), 1)
@@ -432,7 +432,7 @@ def test_complete_review_enter_content(self):
         review_req = reload_db_objects(review_req)
         self.assertEqual(review_req.state_id, "completed")
 
-        with open(os.path.join(self.review_subdir, review_req.review.name + "-" + review_req.review.rev + ".txt")) as f:
+        with open(os.path.join(self.review_subdir, review_req.review.name + ".txt")) as f:
             self.assertEqual(f.read(), "This is a review\nwith two lines")
 
         self.assertEqual(len(outbox), 1)
@@ -463,7 +463,7 @@ def test_complete_review_link_to_mailing_list(self):
         review_req = reload_db_objects(review_req)
         self.assertEqual(review_req.state_id, "completed")
 
-        with open(os.path.join(self.review_subdir, review_req.review.name + "-" + review_req.review.rev + ".txt")) as f:
+        with open(os.path.join(self.review_subdir, review_req.review.name + ".txt")) as f:
             self.assertEqual(f.read(), "This is a review\nwith two lines")
 
         self.assertEqual(len(outbox), 0)

ietf/doc/views_doc.py

@@ -573,7 +573,7 @@ def document_main(request, name, rev=None):
 
 
     if doc.type_id == "review":
-        basename = "{}-{}.txt".format(doc.name, doc.rev)
+        basename = "{}.txt".format(doc.name, doc.rev)
         pathname = os.path.join(doc.get_file_path(), basename)
         content = get_document_content(basename, pathname, split=False)
 

ietf/doc/views_review.py

@@ -377,11 +377,12 @@ def complete_review(request, name, request_id):
             for i in range(1, 100):
                 name_components = [
                     "review",
-                    review_req.team.acronym,
-                    review_req.type.slug,
-                    review_req.reviewer.person.ascii_parts()[3],
                     skip_prefix(review_req.doc.name, "draft-"),
                     form.cleaned_data["reviewed_rev"],
+                    review_req.team.acronym,
+                    review_req.type.slug if review_req.type.slug != "unknown" else "",
+                    review_req.reviewer.person.ascii_parts()[3],
+                    datetime.date.today().isoformat(),
                 ]
                 if i > 1:
                     name_components.append(str(i))
@@ -416,7 +417,7 @@ def complete_review(request, name, request_id):
             else:
                 encoded_content = form.cleaned_data['review_content'].encode("utf-8")
 
-            filename = os.path.join(review.get_file_path(), '{}-{}.txt'.format(review.name, review.rev))
+            filename = os.path.join(review.get_file_path(), '{}.txt'.format(review.name, review.rev))
             with open(filename, 'wb') as destination:
                 destination.write(encoded_content)