From 841f2a9e593ba7904306c013dab460aa34b8cff8 Mon Sep 17 00:00:00 2001
From: Tom Ward <tomward@fmail.co.uk>
Date: Fri, 22 Mar 2024 09:56:44 +0000
Subject: [PATCH] Rename FileApprovalStatus -> FileReviewStatus

---
 airlock/business_logic.py              |  4 ++--
 local_db/data_access.py                |  6 +++---
 local_db/migrations/0006_filereview.py |  2 +-
 local_db/models.py                     |  4 ++--
 tests/unit/test_business_logic.py      | 10 +++++-----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/airlock/business_logic.py b/airlock/business_logic.py
index d23b2b2f..1969b8cf 100644
--- a/airlock/business_logic.py
+++ b/airlock/business_logic.py
@@ -41,7 +41,7 @@ class RequestFileType(Enum):
     SUPPORTING = "supporting"
 
 
-class FileApprovalStatus(Enum):
+class FileReviewStatus(Enum):
     APPROVED = "APPROVED"
     REJECTED = "REJECTED"
 
@@ -151,7 +151,7 @@ class FileReview:
     """
 
     reviewer: str
-    status: FileApprovalStatus
+    status: FileReviewStatus
     created_at: datetime
     updated_at: datetime
 
diff --git a/local_db/data_access.py b/local_db/data_access.py
index 78467010..838441d5 100644
--- a/local_db/data_access.py
+++ b/local_db/data_access.py
@@ -9,9 +9,9 @@
     RequestStatus,
 )
 from local_db.models import (
-    FileApprovalStatus,
     FileGroupMetadata,
     FileReview,
+    FileReviewStatus,
     RequestFileMetadata,
     RequestMetadata,
 )
@@ -173,7 +173,7 @@ def approve_file(self, request_id, relpath, user):
             review, _ = FileReview.objects.get_or_create(
                 file=request_file, reviewer=user.username
             )
-            review.status = FileApprovalStatus.APPROVED
+            review.status = FileReviewStatus.APPROVED
             review.save()
 
     def reject_file(self, request_id, relpath, user):
@@ -185,5 +185,5 @@ def reject_file(self, request_id, relpath, user):
             review, _ = FileReview.objects.get_or_create(
                 file=request_file, reviewer=user.username
             )
-            review.status = FileApprovalStatus.REJECTED
+            review.status = FileReviewStatus.REJECTED
             review.save()
diff --git a/local_db/migrations/0006_filereview.py b/local_db/migrations/0006_filereview.py
index 8a042f29..95565691 100644
--- a/local_db/migrations/0006_filereview.py
+++ b/local_db/migrations/0006_filereview.py
@@ -30,7 +30,7 @@ class Migration(migrations.Migration):
                 (
                     "status",
                     local_db.models.EnumField(
-                        default=airlock.business_logic.FileApprovalStatus["REJECTED"]
+                        default=airlock.business_logic.FileReviewStatus["REJECTED"]
                     ),
                 ),
                 ("created_at", models.DateTimeField(default=django.utils.timezone.now)),
diff --git a/local_db/models.py b/local_db/models.py
index 0f7599fb..bcba3c08 100644
--- a/local_db/models.py
+++ b/local_db/models.py
@@ -2,7 +2,7 @@
 from django.utils import timezone
 from ulid import ulid
 
-from airlock.business_logic import FileApprovalStatus, RequestFileType, RequestStatus
+from airlock.business_logic import FileReviewStatus, RequestFileType, RequestStatus
 
 
 def local_request_id():
@@ -83,7 +83,7 @@ class FileReview(models.Model):
         RequestFileMetadata, related_name="reviews", on_delete=models.CASCADE
     )
     reviewer = models.TextField()
-    status = EnumField(default=FileApprovalStatus.REJECTED, enum=FileApprovalStatus)
+    status = EnumField(default=FileReviewStatus.REJECTED, enum=FileReviewStatus)
     created_at = models.DateTimeField(default=timezone.now)
     updated_at = models.DateTimeField(auto_now=True)
 
diff --git a/tests/unit/test_business_logic.py b/tests/unit/test_business_logic.py
index 477b26b3..bcafcf4d 100644
--- a/tests/unit/test_business_logic.py
+++ b/tests/unit/test_business_logic.py
@@ -8,8 +8,8 @@
 import old_api
 from airlock.business_logic import (
     BusinessLogicLayer,
-    FileApprovalStatus,
     FileReview,
+    FileReviewStatus,
     RequestFileType,
     RequestStatus,
     UrlPath,
@@ -662,7 +662,7 @@ def test_approve_file(bll):
     current_reviews = _get_current_file_reviews(bll, release_request, path, checker)
     assert len(current_reviews) == 1
     assert current_reviews[0].reviewer == "checker"
-    assert current_reviews[0].status == FileApprovalStatus.APPROVED
+    assert current_reviews[0].status == FileReviewStatus.APPROVED
     assert type(current_reviews[0]) == FileReview
 
 
@@ -682,7 +682,7 @@ def test_reject_file(bll):
     current_reviews = _get_current_file_reviews(bll, release_request, path, checker)
     assert len(current_reviews) == 1
     assert current_reviews[0].reviewer == "checker"
-    assert current_reviews[0].status == FileApprovalStatus.REJECTED
+    assert current_reviews[0].status == FileReviewStatus.REJECTED
     assert type(current_reviews[0]) == FileReview
     assert len(current_reviews) == 1
 
@@ -704,7 +704,7 @@ def test_approve_then_reject_file(bll):
     print(current_reviews)
     assert len(current_reviews) == 1
     assert current_reviews[0].reviewer == "checker"
-    assert current_reviews[0].status == FileApprovalStatus.APPROVED
+    assert current_reviews[0].status == FileReviewStatus.APPROVED
     assert type(current_reviews[0]) == FileReview
 
     bll.reject_file(release_request, path, checker)
@@ -712,6 +712,6 @@ def test_approve_then_reject_file(bll):
     current_reviews = _get_current_file_reviews(bll, release_request, path, checker)
     assert len(current_reviews) == 1
     assert current_reviews[0].reviewer == "checker"
-    assert current_reviews[0].status == FileApprovalStatus.REJECTED
+    assert current_reviews[0].status == FileReviewStatus.REJECTED
     assert type(current_reviews[0]) == FileReview
     assert len(current_reviews) == 1