update tests, add new statuses, refactor validators and constants

openprocurement · Aug 16, 2017 · dc3aaaa · dc3aaaa
1 parent 7b5a3ce
commit dc3aaaa
Show file tree

Hide file tree

Showing 5 changed files with 124 additions and 201 deletions.
diff --git a/openregistry/lots/basic/adapters.py b/openregistry/lots/basic/adapters.py
@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 from openregistry.lots.core.adapters import LotConfigurator
-from .constants import STATUS_CHANGES, TERMINATED_STATUSES
+from .constants import STATUS_CHANGES
 
 
 class BasicLotConfigurator(LotConfigurator):
     """ BelowThreshold Tender configuration adapter """
 
     name = "Basic Lot configurator"
     available_statuses = STATUS_CHANGES
-    terminated_statuses = TERMINATED_STATUSES
diff --git a/openregistry/lots/basic/constants.py b/openregistry/lots/basic/constants.py
@@ -2,33 +2,54 @@
 
 STATUS_CHANGES = {
     "draft": {
-        "deleted": ["lot_owner", "Administrator"],
-        "waiting": ["lot_owner", "Administrator"],
+        "editing_permissions": ["lot_owner", "Administrator"],
+        "next_status": {
+            "pending": ["lot_owner", "Administrator"],
+        }
+    },
+    "pending": {
+        "editing_permissions": ["lot_owner", "Administrator"],
+        "next_status": {
+            "draft": ["Administrator"],
+            "deleted": ["lot_owner", "Administrator"],
+            "verification": ["lot_owner", "Administrator"]
+        }
     },
     "deleted": {
-
-    },
-    "waiting": {
-        "invalid": ["bot1", "Administrator"],
-        "active.pending": ["bot1", "Administrator"],
-    },
-    "invalid": {
-
-    },
-    "active.pending": {
-        "dissolved": ["lot_owner", "Administrator"],
-        "active.inauction": ["bot2", "Administrator"],
+        "editing_permissions": [],
+        "next_status": {}
+    },
+    "verification": {
+        "editing_permissions": ["bot1", "Administrator"],
+        "next_status": {
+            "pending": ["bot1", "Administrator"],
+            "active.salable": ["bot1", "Administrator"]
+        }
+    },
+    "active.salable": {
+        "editing_permissions": ["bot2", "Administrator", "lot_owner"],
+        "next_status": {
+            "dissolved": ["lot_owner", "Administrator"],
+            "active.awaiting": ["bot2", "Administrator"],
+            "verification": ["Administrator"]
+        }
     },
     "dissolved": {
-
-    },
-    "active.inauction": {
-        "active.pending": ["bot2", "Administrator"],
-        "sold": ["bot2", "Administrator"],
-    },
-    "sold": {
-
-    },
+        "editing_permissions": [],
+        "next_status": {}
+    },
+    "active.awaiting": {
+        "editing_permissions": ["bot2", "Administrator"],
+        "next_status": {
+            "active.auction": ["bot2", "Administrator"],
+            "active.salable": ["bot2", "Administrator"]
+        }
+    },
+    "active.auction": {
+        "editing_permissions": ["bot2", "Administrator"],
+        "next_status": {
+            "active.salable":  ["Administrator"],
+            "sold": ["bot2", "Administrator"]
+        }
+    }
 }
-
-TERMINATED_STATUSES = ["deleted", "sold", "dissolved"]
diff --git a/openregistry/lots/basic/tests/lot.py b/openregistry/lots/basic/tests/lot.py
@@ -18,7 +18,6 @@
     listing_draft,
     listing_changes,
     create_lot,
-    patch_lot,
     simple_add_lot,
     check_lot_assets,
 )
@@ -33,19 +32,19 @@ class LotTest(BaseWebTest):
 class LotResourceTest(BaseLotWebTest):
     initial_data = test_lot_data
     initial_auth = ('Basic', ('broker', ''))
+    initial_status = 'pending'
     relative_to = os.path.dirname(__file__)
-    test_create_lot = snitch(create_lot)
-    test_patch_lot = snitch(patch_lot)
-    test_lot_not_found = snitch(lot_not_found)
-    test_listing = snitch(listing)
-    test_get_lot = snitch(get_lot)
-    test_dateModified_lot = snitch(dateModified_lot)
-    test_change_draft_lot = snitch(change_draft_lot)
-    test_change_waiting_lot = snitch(change_waiting_lot)
-    test_change_dissolved_lot = snitch(change_dissolved_lot)
-    test_listing_draft = snitch(listing_draft)
-    test_listing_changes = snitch(listing_changes)
-    test_check_lot_assets = snitch(check_lot_assets)
+    test_01_listing = snitch(listing)
+    test_02_listing_draft = snitch(listing_draft)
+    test_03_listing_changes = snitch(listing_changes)
+    test_04_lot_not_found = snitch(lot_not_found)
+    test_05_get_lot = snitch(get_lot)
+    test_06_dateModified_lot = snitch(dateModified_lot)
+    test_07_create_lot = snitch(create_lot)
+    test_08_change_draft_lot = snitch(change_draft_lot)
+    test_09_change_waiting_lot = snitch(change_waiting_lot)
+    test_10_change_dissolved_lot = snitch(change_dissolved_lot)
+    test_11_check_lot_assets = snitch(check_lot_assets)
 
 
 def suite():