Merge branch 'develop' into renovate/typescript-eslint-monorepo

wasedatime · Mar 16, 2023 · 5c326fb · 5c326fb
2 parents e55be23 + c85d8e1
commit 5c326fb
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 20 deletions.
diff --git a/.github/actions/install-deps/action.yml b/.github/actions/install-deps/action.yml
@@ -1,5 +1,5 @@
-name: 'Install Dependencies'
-description: 'Workflow for installing dependencies'
+name: "Install Dependencies"
+description: "Workflow for installing dependencies"
 runs:
   using: "composite"
   steps:
@@ -10,7 +10,7 @@ runs:
       uses: actions/setup-node@v3
       with:
         node-version: 16.x
-        cache: 'pnpm'
+        cache: "pnpm"
     - name: Setup CDK
       shell: bash
       run: |

diff --git a/lib/stacks/business.ts b/lib/stacks/business.ts
@@ -65,11 +65,12 @@ export class WasedaTimeBusinessLayer extends BusinessLayer {
         this.dataInterface.getEndpoint(DataEndpoint.TIMETABLE),
         true,
       )
-      // .addService(
-      //   'thread',
-      //   this.dataInterface.getEndpoint(DataEndpoint.THREAD),
-      //   true,
-      // )
+      .addService(
+        'thread',
+        // this.dataInterface.getEndpoint(DataEndpoint.THREAD),
+        'Anystring',
+        true,
+      )
       .addService(
         'comment',
         this.dataInterface.getEndpoint(DataEndpoint.COMMENT),

diff --git a/lib/stacks/persistence.ts b/lib/stacks/persistence.ts
@@ -76,5 +76,7 @@ export class WasedaTimePersistenceLayer extends PersistenceLayer {
     this.operationInterface.setEndpoint(OperationEndpoint.SYLLABUS, {
       [syllabusDataPipeline.processor.stateMachineArn]: 'scraper',
     });
+
+    this.exportValue(dynamoDatabase.tables[Collection.THREAD].tableName);
   }
 }
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "eslint-import-resolver-node": "0.3.6",
     "eslint-import-resolver-typescript": "3.5.2",
     "eslint-plugin-import": "2.26.0",
-    "husky": "8.0.2",
+    "husky": "8.0.3",
     "jest": "29.3.1",
     "standard-version": "9.5.0",
     "ts-jest": "29.0.3",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/lambda/syllabus-scraper/const.py b/src/lambda/syllabus-scraper/const.py
@@ -221,16 +221,18 @@
 }
 
 modality_enum_map = {
-    "対面": 0,
-    "フル対面": 0,
-    "ハイブリッド（対面／オンライン併用）": 1,
-    "複合（対面/オンデマンド/リアルタイム配信/課題提出）": 1,
-    "フルオンデマンド（曜日時限なし）": 2,
+    "【対面】": 0,
+    "【対面】ハイブリッド（対面回数半数以上）": 1,
+    "【非常時】ハイブリッド": 1,
+    "【オンライン】ハイブリッド（対面回数半数未満）": 1,
+    "【オンライン】フルオンデマンド": 2,
+    "【非常時】フルオンデマンド": 2,
     "フルオンデマンド（コロナ）": 2,
     "フルオンデマンド（既存）": 2,
     "オンデマンド（曜日時限あり）": 3,
     "オンデマンド": 3,
-    "リアルタイム配信": 4
+    "【オンライン】リアルタイム配信": 4,
+    "【非常時】リアルタイム配信": 4,
 }
 
 cron_schedule = ["01-01", "02-01", "02-14", "02-24", "03-01", "03-04", "03-07", "03-10", "03-16", "03-18", "03-21",