Merge branch 'feature-NEWDWH2021-1252' into feature-NEWDWH2021-1255

ecs/crm-datafetch/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.9
 
 ENV TZ="Asia/Tokyo"
 

ecs/crm-datafetch/Pipfile

@@ -23,4 +23,4 @@ pytest-html = "*"
 moto = "*"
 
 [requires]
-python_version = "3.8"
+python_version = "3.9"

ecs/crm-datafetch/README.md

@@ -4,7 +4,7 @@
 
 ### ツールのバージョン
 
-- Python 3.8.x
+- Python 3.9.x
 - PipEnv(Pythonの依存関係管理用モジュール)
 
 ### 開発環境

rds_mysql/stored_procedure/internal02/get_distribution_to_schema.sql

@@ -0,0 +1,66 @@
+-- A5M2で実行時に[SQL] - [スラッシュ(/)のみの行でSQLを区切る]に変えてから実行する
+-- $$から始まる文字は後からREPLACEする文字を示す独自ルール
+CREATE FUNCTION internal02.`get_distribution_to_schema`(target_table VARCHAR(100), target_column VARCHAR(100), target_column_value VARCHAR(100))
+RETURNS VARCHAR(20)
+DETERMINISTIC
+
+BEGIN
+    -- 返却値
+    DECLARE ret VARCHAR(20) DEFAULT NULL;
+    -- other振分先蓄積スキーマ
+    DECLARE distribution_schema_other VARCHAR(20) DEFAULT NULL;
+    -- 振分判断項目値
+    DECLARE value_from_column_value VARCHAR(100) DEFAULT NULL;
+    -- 振分先蓄積スキーマ
+    DECLARE value_to_schema VARCHAR(20) DEFAULT NULL;
+    
+    -- カーソルがデータセットの最後に達したか判定するための変数
+    DECLARE done INT DEFAULT FALSE;
+
+    -- カーソル
+    DECLARE cursor_crm_data_distribution_settings CURSOR FOR
+        SELECT `from_column_value`, `to_schema`
+        FROM internal02.`crm_data_distribution_settings`
+        WHERE `table_id` = target_table
+            AND `from_column_id` = target_column;
+        
+    -- カーソルがデータセットをフェッチしきった時の動作を制御
+    DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = TRUE;
+    
+    OPEN cursor_crm_data_distribution_settings;
+    
+    read_loop: LOOP
+        FETCH cursor_crm_data_distribution_settings INTO value_from_column_value, value_to_schema;
+        
+        -- カーソルの読み出しが完了していればループを抜ける
+        IF done THEN
+            LEAVE read_loop;
+        END IF;
+
+        IF value_from_column_value = target_column_value THEN
+            SET ret = value_to_schema;
+        END IF;
+        
+         -- カーソルから読み出した行が'other'かを判断
+        IF value_from_column_value = 'other' THEN
+            SET distribution_schema_other = value_to_schema;
+        END IF;
+    END LOOP;
+
+    CLOSE cursor_crm_data_distribution_settings;
+    
+    -- 例外処理
+    IF distribution_schema_other IS NULL THEN
+        SET @error_msg = 'データ振分設定テーブルにotherの設定がされていません。テーブルID: $$target_table$$, 振分判断項目ID: $$target_column$$';
+        SET @error_msg = REPLACE(@error_msg, "$$target_table$$", target_table);
+        SET @error_msg = REPLACE(@error_msg, "$$target_column$$", target_column);
+        SIGNAL SQLSTATE '45000'
+            SET MESSAGE_TEXT = @error_msg;
+    END IF;
+
+    IF ret IS NULL THEN
+        SET ret = distribution_schema_other;
+    END IF;
+
+    RETURN ret;
+END

s3/config/crm/last_fetch_datetime/Clinical_Trial__c.json

@@ -0,0 +1,5 @@
+{
+    "last_fetch_datetime_from": "1900-01-01T00:00:00.000Z",
+    "last_fetch_datetime_to": ""
+}
+  

s3/config/crm/last_fetch_datetime/H1Insights__H1_Insights_Configuration__mdt.json

@@ -0,0 +1,5 @@
+{
+    "last_fetch_datetime_from": "1900-01-01T00:00:00.000Z",
+    "last_fetch_datetime_to": ""
+}
+  

s3/config/crm/last_fetch_datetime/MSJ_Congresses__c.json

@@ -0,0 +1,5 @@
+{
+    "last_fetch_datetime_from": "1900-01-01T00:00:00.000Z",
+    "last_fetch_datetime_to": ""
+}
+  

s3/config/crm/last_fetch_datetime/Publication__c.json

@@ -0,0 +1,5 @@
+{
+    "last_fetch_datetime_from": "1900-01-01T00:00:00.000Z",
+    "last_fetch_datetime_to": ""
+}
+  

s3/config/crm/object_info/crm_object_list_diff.json

@@ -3241,6 +3241,122 @@
             ],
             "is_skip": false,
             "is_update_last_fetch_datetime": true
+        },
+        {
+            "object_name": "MSJ_Congresses__c",
+            "columns": [
+                "Id",
+                "OwnerId",
+                "IsDeleted",
+                "Name",
+                "CreatedDate",
+                "CreatedById",
+                "LastModifiedDate",
+                "LastModifiedById",
+                "SystemModstamp",
+                "MayEdit",
+                "IsLocked",
+                "LastViewedDate",
+                "LastReferencedDate",
+                "MSJ_Account__c",
+                "MSJ_Conference_Name__c",
+                "MSJ_Date_Presented__c",
+                "MSJ_End_Date__c",
+                "MSJ_External_ID__c",
+                "MSJ_Link_to_Section_on_H1_Profile__c",
+                "MSJ_Organizer__c",
+                "MSJ_Session_Poster_Title__c",
+                "MSJ_Session_Poster__c",
+                "MSJ_Start_Date__c"
+            ],
+            "is_skip": false,
+            "is_update_last_fetch_datetime": true
+        },
+        {
+            "object_name": "H1Insights__H1_Insights_Configuration__mdt",
+            "columns": [
+                "Id",
+                "DeveloperName",
+                "MasterLabel",
+                "Language",
+                "NamespacePrefix",
+                "Label",
+                "QualifiedApiName",
+                "SystemModstamp",
+                "H1Insights__API_Endpoint__c",
+                "H1Insights__API_Key__c",
+                "H1Insights__H1_Customer_ID__c",
+                "H1Insights__Support_Email_Address__c",
+                "H1Insights__Testing_H1_Person_ID__c",
+                "H1Insights__Testing_NPI_Number__c"
+            ],
+            "is_skip": false,
+            "is_update_last_fetch_datetime": true
+        },
+        {
+            "object_name": "Publication__c",
+            "columns": [
+                "Id",
+                "IsDeleted",
+                "Name",
+                "CreatedDate",
+                "CreatedById",
+                "LastModifiedDate",
+                "LastModifiedById",
+                "SystemModstamp",
+                "MayEdit",
+                "IsLocked",
+                "LastViewedDate",
+                "LastReferencedDate",
+                "Date__c",
+                "Title__c",
+                "Account__c",
+                "Journal__c",
+                "External_ID_vod__c",
+                "Journal_vod__c",
+                "PubMed_ID_Name_vod__c",
+                "PubMed_URL_vod__c",
+                "Publication_Type_vod__c",
+                "MSJ_Authors__c",
+                "MSJ_External_ID__c",
+                "MSJ_Full_Publication_Title__c",
+                "MSJ_Journal__c"
+            ],
+            "is_skip": false,
+            "is_update_last_fetch_datetime": true
+        },
+        {
+            "object_name": "Clinical_Trial__c",
+            "columns": [
+                "Id",
+                "IsDeleted",
+                "Name",
+                "CreatedDate",
+                "CreatedById",
+                "LastModifiedDate",
+                "LastModifiedById",
+                "SystemModstamp",
+                "MayEdit",
+                "IsLocked",
+                "LastViewedDate",
+                "LastReferencedDate",
+                "Date__c",
+                "Description__c",
+                "Phase__c",
+                "Role__c",
+                "Status__c",
+                "Sponsor__c",
+                "Account__c",
+                "End_Date_vod__c",
+                "External_ID_vod__c",
+                "ID_vod__c",
+                "Start_Date_vod__c",
+                "MSJ_Clinical_Trial_Full_Title__c",
+                "MSJ_External_ID__c",
+                "MSJ_Inclusion_Criteria__c"
+            ],
+            "is_skip": false,
+            "is_update_last_fetch_datetime": true
         }
     ]
 }