format

Author: yuji38kwmt

annofabapi/dataclass/organization.py

@@ -33,6 +33,16 @@ class OrganizationActivity:
     """"""
 
 
+@dataclass_json
+@dataclass
+class OrganizationSummary:
+    """
+    
+    """
+    last_tasks_updated_datetime: Optional[str]
+    """"""
+
+
 @dataclass_json
 @dataclass
 class Organization:

generate/generate.sh

@@ -183,7 +183,7 @@ cat partial-header/dataclass/common.py partial-header/dataclass/my.py  \
  ${model_files[@]} > ../annofabapi/dataclass/my.py
 
 # Organization
-declare -a model_files=(${MODELS_DIR}/organization_activity.py ${MODELS_DIR}/organization.py)
+declare -a model_files=(${MODELS_DIR}/organization_activity.py ${MODELS_DIR}/organization_summary.py ${MODELS_DIR}/organization.py)
 cat partial-header/dataclass/common.py partial-header/dataclass/organization.py  \
  ${model_files[@]} > ../annofabapi/dataclass/organization.py
 

tests/test_local_utils.py

@@ -5,7 +5,7 @@
 #     assert to_iso8601_extension(d, tz_jst) == "2019-10-08T16:20:08.241+09:00"
 
 from annofabapi.models import TaskPhase
-from annofabapi.utils import (number_of_rejections, get_task_history_index_skipped_acceptance,
+from annofabapi.utils import (get_number_of_rejections, get_task_history_index_skipped_acceptance,
                               get_task_history_index_skipped_inspection)
 
 
@@ -239,18 +239,18 @@ def test_get_task_history_index_skipped_inspection_検査2回_検査1回目で
         expected = []
         assert all([a == b for a, b in zip(actual, expected)])
 
-    def test_number_of_rejections_教師付1回目(self):
+    def test_get_number_of_rejections_教師付1回目(self):
         task_history_short_list = [{
             "account_id": self.ACCOUNT_ID,
             "phase": "annotation",
             "phase_stage": 1,
             "worked": True
         }]
 
-        actual = number_of_rejections(task_history_short_list, TaskPhase.ACCEPTANCE)
+        actual = get_number_of_rejections(task_history_short_list, TaskPhase.ACCEPTANCE)
         assert actual == 0
 
-    def test_number_of_rejections_受入で1回差戻(self):
+    def test_get_number_of_rejections_受入で1回差戻(self):
         task_history_short_list = [
             {
                 "account_id": self.ACCOUNT_ID,
@@ -272,10 +272,10 @@ def test_number_of_rejections_受入で1回差戻(self):
             },
         ]
 
-        actual = number_of_rejections(task_history_short_list, TaskPhase.ACCEPTANCE)
+        actual = get_number_of_rejections(task_history_short_list, TaskPhase.ACCEPTANCE)
         assert actual == 1
 
-    def test_number_of_rejections_検査で1回差戻(self):
+    def test_get_number_of_rejections_検査で1回差戻(self):
         task_history_short_list = [
             {
                 "account_id": self.ACCOUNT_ID,
@@ -297,5 +297,52 @@ def test_number_of_rejections_検査で1回差戻(self):
             },
         ]
 
-        actual = number_of_rejections(task_history_short_list, TaskPhase.INSPECTION)
+        actual = get_number_of_rejections(task_history_short_list, TaskPhase.INSPECTION)
         assert actual == 1
+
+    def test_get_number_of_rejections_検査と受入で1回差戻(self):
+        task_history_short_list = [{
+            "account_id": self.ACCOUNT_ID,
+            "phase": "annotation",
+            "phase_stage": 1,
+            "worked": True
+        }, {
+            "account_id": self.ACCOUNT_ID,
+            "phase": "inspection",
+            "phase_stage": 1,
+            "worked": True
+        }, {
+            "account_id": self.ACCOUNT_ID,
+            "phase": "annotation",
+            "phase_stage": 1,
+            "worked": True
+        }, {
+            "account_id": self.ACCOUNT_ID,
+            "phase": "inspection",
+            "phase_stage": 1,
+            "worked": True
+        }, {
+            "account_id": self.ACCOUNT_ID,
+            "phase": "acceptance",
+            "phase_stage": 1,
+            "worked": True
+        }, {
+            "account_id": self.ACCOUNT_ID,
+            "phase": "annotation",
+            "phase_stage": 1,
+            "worked": True
+        }, {
+            "account_id": "00589ed0-dd63-40db-abb2-dfe5e13c8299",
+            "phase": "inspection",
+            "phase_stage": 1,
+            "worked": True
+        }, {
+            "account_id": self.ACCOUNT_ID,
+            "phase": "acceptance",
+            "phase_stage": 1,
+            "worked": True
+        }]
+        actual_inspection = get_number_of_rejections(task_history_short_list, TaskPhase.INSPECTION)
+        assert actual_inspection == 1
+        actual_acceptance = get_number_of_rejections(task_history_short_list, TaskPhase.ACCEPTANCE)
+        assert actual_acceptance == 1