feat: レビュー指摘対応

ecs/jskult-webapp/src/model/internal/master_mainte_csv.py

@@ -51,7 +51,7 @@ class MasterMainteCSVItem(metaclass=ABCMeta):
         error_list = []
         # 項目数チェック
         error_list.extend(self.check_item_count())
-        if len(error_list) > 0:
+        if len(error_list) == 0:
             # 必須チェック 及び コメントエラーチェック
             error_list.extend(self.check_require())
             # 施設コード存在チェック
@@ -487,16 +487,16 @@ class MasterMainteCSVItems:
     lines: list[MasterMainteCSVItem]
     __i: int = 0
 
-    def reset(self):
-        self.__i = 0
-
     def to_json(self):
         # CSVをjsonに変換
-        csv_row_dict_list: list[dict] = [row_item.csv_row_data() for row_item in self.lines]
+        csv_row_dict_list: list[dict] = self.to_dict()
 
         # json作成
         return json.dumps(csv_row_dict_list, ensure_ascii=False)
 
+    def to_dict(self):
+        return [row_item.csv_row_data() for row_item in self.lines]
+
     def __iter__(self):
         return self
 

ecs/jskult-webapp/src/model/view/inst_emp_csv_upload_view_model.py

@@ -1,8 +1,6 @@
 from typing import Optional
 
 from pydantic import BaseModel
-from src.model.view.mainte_csv_upload_model import CsvUploadModel
-from src.model.view.mainte_csv_error_model import CsvErrorModel
 from src.system_var import constants
 
 
@@ -10,11 +8,11 @@ class InstEmpCsvUploadViewModel(BaseModel):
     subtitle: str = '施設担当者データCSVアップロード'
     is_verified: Optional[bool]
     is_insert: Optional[bool]
-    error_message_list: Optional[list[CsvErrorModel]]
+    error_message_list: Optional[list[str]]
     select_function: Optional[str]
     select_table: Optional[str]
     csv_file_name: Optional[str]
-    csv_upload_list: Optional[list[CsvUploadModel]]
+    csv_upload_list: Optional[list[dict]]
     json_upload_data: Optional[str]
     result_message_list: Optional[list[str]]
     dialog_msg: Optional[str]

ecs/jskult-webapp/src/model/view/mainte_csv_error_model.py

@@ -1,9 +0,0 @@
-from pydantic import BaseModel
-from typing import Optional
-
-
-class CsvErrorModel(BaseModel):
-    error_message: Optional[str]
-
-    # def __init__(self, error_message: str) -> None:
-    #    super().__init__(error_message=error_message)

ecs/jskult-webapp/src/model/view/mainte_csv_upload_model.py

@@ -1,7 +0,0 @@
-from pydantic import BaseModel
-from typing import Optional
-
-
-class CsvUploadModel(BaseModel):
-    subtitle: str = '施設担当者データCSVアップロード'
-    csv_row: Optional[dict]

ecs/jskult-webapp/src/services/master_mainte_service.py

@@ -19,8 +19,6 @@ from src.model.internal.master_mainte_emp_chg_inst_function import NewEmpChgInst
 from src.model.internal.master_mainte_emp_chg_inst_function import ChangeEmpChgInstFunction
 from src.model.view.inst_emp_csv_upload_view_model import InstEmpCsvUploadViewModel
 from src.model.view.table_override_view_model import TableOverrideViewModel
-from src.model.view.mainte_csv_upload_model import CsvUploadModel
-from src.model.view.mainte_csv_error_model import CsvErrorModel
 from src.model.request.master_mainte_csvup import MasterMainteCsvUpModel
 from src.model.request.master_mainte_csvdl import MasterMainteCsvDlModel
 from src.logging.get_logger import get_logger
@@ -79,19 +77,16 @@ class MasterMainteService(BaseService):
 
         error_message_list = []
         # CSVファイル0件(ヘッダ行のみ)チェック
-        if len(csv_items) == 0:
+        if len(csv_items.lines) == 0:
             error_message_list.append('選択されたExcelファイルの2行目以降に値が記入されておりません。')
         else:
             for row_item in csv_items:
-                error_message_list.extend([CsvErrorModel(data) for data in row_item.validate()])
+                error_message_list.extend([data for data in row_item.validate()])
 
-        csv_items.reset()
         csv_upload_list = []
         json_upload_data = ''
         if len(error_message_list) == 0:
-            csv_upload_list: list[CsvUploadModel] = [CsvUploadModel(
-                csv_row=row_item.csv_row_data()) for row_item in csv_items]
-
+            csv_upload_list: list[dict] = csv_items.to_dict()
             # json作成
             json_upload_data = csv_items.to_json()
 
@@ -134,7 +129,7 @@ class MasterMainteService(BaseService):
         (result_message_list, raw_error_list) = emp_chg_inst.save()
 
         error_message_list = []
-        error_message_list.extend([CsvErrorModel(data) for data in raw_error_list])
+        error_message_list.extend([data for data in raw_error_list])
 
         mainte_csv_up = InstEmpCsvUploadViewModel(
             is_insert=True,

ecs/jskult-webapp/src/templates/instEmpCsvUL.html

@@ -137,8 +137,8 @@
         </div>
         {% if not mainte_csv_up.is_error_message_list_empty() %}
             <div id="ulMsg" class="footerMsg errorColor">
-                {% for error in mainte_csv_up.error_message_list %}
-                    {{error.error_message}}<br>
+                {% for error_message in mainte_csv_up.error_message_list %}
+                    {{error_message}}<br>
                 {% endfor %}
             </div>
         {% elif mainte_csv_up.is_verified and mainte_csv_up.is_error_message_list_empty() %}
@@ -154,7 +154,7 @@
                         </tr>
                         {% for item in mainte_csv_up.csv_upload_list %}
                             <tr>
-                                {% for key, value in item.csv_row.items() %}
+                                {% for key, value in item.items() %}
                                     <td>{{value}}</td>
                                 {% endfor %}
                             </tr>