Merge branch 'main' into fix/style

Author: 448jp

.github/workflows/after-purchase.yml

@@ -34,3 +34,5 @@ jobs:
           PEATIX_BASIC_PASSWORD: ${{ secrets.PEATIX_BASIC_PASSWORD }}
           SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
           SUPABASE_KEY: ${{ secrets.SUPABASE_KEY }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}

.github/workflows/sales-daily.yml

@@ -34,3 +34,5 @@ jobs:
           PEATIX_BASIC_PASSWORD: ${{ secrets.PEATIX_BASIC_PASSWORD }}
           SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
           SUPABASE_KEY: ${{ secrets.SUPABASE_KEY }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}

apps/peatix-adapter/src/after-purchase/after-purchase.module.ts

@@ -16,7 +16,6 @@ import { SupabaseModule } from 'src/supabase/supabase.module'
 import { SupabaseService } from 'src/supabase/supabase.service'
 import { DiscordModule } from 'src/discord/discord.module'
 import { DiscordService } from 'src/discord/discord.service'
-import { UnactivatedCheckCommand } from 'src/unactivated-check/unactivated-check.command'
 import { SalesDailyCommand } from 'src/sales-daily/sales-daily.command'
 import { UnactivatedCheckService } from 'src/unactivated-check/unactivated-check.service'
 import { SalesDailyService } from 'src/sales-daily/sales-daily.service'
@@ -42,7 +41,6 @@ import { SalesDailyService } from 'src/sales-daily/sales-daily.service'
       useClass: PuppeteerService,
     },
     AfterPurchaseCommand,
-    UnactivatedCheckCommand,
     SalesDailyCommand,
     AfterPurchaseService,
     UnactivatedCheckService,

apps/peatix-adapter/src/after-purchase/after-purchase.service.ts

@@ -47,15 +47,7 @@ export class AfterPurchaseService {
     const personalSponsors = [...new Set(_personalSponsors)] // 重複を削除
     // this.logger.log(receipts)
     const today = new Date()
-    this.logger.log(
-      `${today.getFullYear()}/${today.getMonth() + 1}/${today.getDate()}時点の${Constants.PEATIX_GENERAL_TICKET}売上状況: ${receipts.filter(v => v.role === Constants.PEATIX_GENERAL_ROLE).length}枚 (+${receipts.filter(v => v.role === Constants.PEATIX_GENERAL_ROLE).filter(v => v.date.includes(`${today.getFullYear()}/${today.getMonth() + 1}/${today.getDate()}`)).length}枚)`,
-    )
-    this.logger.log(
-      `${today.getFullYear()}/${today.getMonth() + 1}/${today.getDate()}時点の${Constants.PEATIX_WITH_PARTY_TICKET}売上状況: ${receipts.filter(v => v.role === Constants.PEATIX_WITH_PARTY_ROLE).length}枚 (+${receipts.filter(v => v.role === Constants.PEATIX_WITH_PARTY_ROLE).filter(v => v.date.includes(`${today.getFullYear()}/${today.getMonth() + 1}/${today.getDate()}`)).length}枚)`,
-    )
-    this.logger.log(
-      `${Constants.PEATIX_PERSONAL_SPONSOR_TICKET}売上状況: ${personalSponsors.length}枚 ('${personalSponsors.join('\', \'')}')`,
-    )
+
     this.discordService.send(
       'After Purchase Bot', 
       `${today.getFullYear()}/${today.getMonth() + 1}/${today.getDate()}時点の${Constants.PEATIX_GENERAL_TICKET}売上状況: ${receipts.filter(v => v.role === Constants.PEATIX_GENERAL_ROLE).length}枚 (+${receipts.filter(v => v.role === Constants.PEATIX_GENERAL_ROLE).filter(v => v.date.includes(`${today.getFullYear()}/${today.getMonth() + 1}/${today.getDate()}`)).length}枚)`,

apps/peatix-adapter/src/constnats.ts

@@ -8,7 +8,7 @@ export const Constants = {
   PEATIX_RECEIPT_ID_ROW_INDEX: 0, // レシート ID
   PEATIX_APPLIED_AT_ROW_INDEX: 3, // 申込日時
   PEATIX_RECEIPTS_TICKET_NAME_ROW_INDEX: 4, // チケット名
-  PEATIX_PERSONAL_SPONSOR_NAME_ROW_INDEX: 15, // 個人スポンサー クレジット名
+  PEATIX_PERSONAL_SPONSOR_NAME_ROW_INDEX: 16, // 個人スポンサー クレジット名
   PEATIX_GENERAL_ROLE: 'attendee',
   PEATIX_WITH_PARTY_ROLE: 'attendee + party',
 } as const

apps/peatix-adapter/src/discord/discord.service.ts

@@ -15,18 +15,22 @@ export class DiscordService {
   }
 
   public async send(user: string, content: string) {
-    await axios.post(
-      this.envService.DISCORD_WEBHOOK_URL,
-      {
-        username: user,
-        content: content,
-      },
-      {
-        headers: {
-          'Accept': 'application/json',
-          'Content-type': 'application/json',
+    await axios
+      .post(
+        this.envService.DISCORD_WEBHOOK_URL,
+        {
+          username: user,
+          content: content,
         },
-      },
-    )
+        {
+          headers: {
+            'Accept': 'application/json',
+            'Content-type': 'application/json',
+          },
+        },
+      )
+      .catch((error) => {
+        this.logger.error(error)
+      })
   }
 }

apps/peatix-adapter/src/sales-daily/sales-daily.service.ts

@@ -49,8 +49,8 @@ export class SalesDailyService {
       archives[2].push(`${receipts.filter(v => v.role === Constants.PEATIX_WITH_PARTY_ROLE).filter(v => v.date.includes(`${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`)).length}`)
     }
     for (const archive of archives) {
-      this.logger.log(`${archive.join(', ')} `)
-      this.discordService.send('After Purchase Bot', `${archive.join(', ')} `)
+      this.logger.log(`${archive.join(',')}`)
+      this.discordService.send('After Purchase Bot', `${archive.join(',')}`)
     }
   }
 }

apps/peatix-adapter/src/supabase/supabase.service.ts

@@ -39,9 +39,9 @@ export class SupabaseService {
     const targetData = { ...targets }
 
     const { data, error } = await this.client.from('attendees')
-      .upsert({ role: targetData.role, activated_at: new Date().toISOString(), canceled_at: '' })
+      .update({ role: targetData.role, activated_at: new Date().toISOString(), canceled_at: null })
       .eq('receipt_id', targetData.receipt_id)
-      .eq('activated_at', '')
+      .is('activated_at', null)
     if (error) return { status: false, data: null }
 
     return { status: true, data }
@@ -51,8 +51,8 @@ export class SupabaseService {
     this.getClient()
 
     const { data, error } = await this.client.from('attendees')
-      .upsert({ canceled_at: new Date().toISOString() })
-      .eq('activated_at', '')
+      .update({ canceled_at: new Date().toISOString() })
+      .is('activated_at', null)
     if (error) return { status: false, data: null }
 
     return { status: true, data }

apps/peatix-adapter/src/unactivated-check/unactivated-check.service.ts

@@ -16,6 +16,6 @@ export class UnactivatedCheckService {
   async apply() {
     this.supabaseService.updateUnactivatedAttendees()
 
-    this.discordService.send('After Purchase Bot', '未反映者 反映済')
+    // this.discordService.send('After Purchase Bot', '未反映者 反映済')
   }
 }

apps/web-docs/peatix/csv-usage.md

@@ -142,17 +142,23 @@ https://www.figma.com/file/mRTYOtFjg3L8ozmjEEhHLh/Vue-Fes-Japan-2024
 +
 ├─ src
 │ ├─ after-purchase
-|   ├- after-purchase.module.ts  # 購入後の処理で使用が予定されている依存関係を置く
+|   ├- after-purchase.module.ts      # 購入後に自動反映される予定のユーザーを対象として、使用が予定されている依存関係を置く
 |   └- after-purchase.service.ts
 │ ├─ env
-|   ├- env.module.ts             # 環境変数を読み込む基盤を置く
+|   ├- env.module.ts                 # 環境変数を読み込む基盤を置く
 |   └- env.service.ts
 │ ├─ peatix-order
-|   ├- peatix-order.module.ts    # Peatix へのログインを試み、購入情報を取得、Supabase へ整形したデータを挿入する基盤を置く
+|   ├- peatix-order.module.ts        # Peatix へのログインを試み、購入情報を取得、Supabase へ整形したデータを挿入する基盤を置く
 |   └- peatix-order.service.ts
 │ ├─ puppeteer
-|   └- puppeteer.service.ts      # スクレイピング処理の基盤を置く
-| └- cmd.ts                      # 処理の窓口を置く
+|   └- puppeteer.service.ts          # スクレイピング処理の基盤を置く
+│ ├─ sales-daily
+|   ├- sales-daily.module.ts         # 各日の購入処理で使用が予定されている依存関係を置く
+|   └- sales-daily.service.ts
+│ ├─ unactivated-check
+|   ├- unactivated-check.module.ts   # 自動反映されなかったユーザーを対象として、処理で使用が予定されている依存関係を置く
+|   └- unactivated-check.service.ts
+| └- cmd.ts                          # 処理の窓口を置く
 ├─ nest-cli.json
 └- package.json
 ```
@@ -176,13 +182,13 @@ async function bootstrap() {
 bootstrap()
 ```
 
-### NestJS とはなんぞや
+## NestJS とはなんぞや
 
 そもそも NestJS について、深く知りたいという方のためのセクションを設けました。
 
 ::: tip
 
-NestJS の構造からたいへん上手くまとまっているため、合わせてこちらをご一読いただくと良いように考えています。
+NestJS の構造からたいへん上手くまとまっており、合わせてこちらをご一読いただけますと。
 
 [NestJS の基礎概念の図解と要約](https://zenn.dev/morinokami/articles/nestjs-overview)