Merge branch 'master' into stripe-donation-flow

.github/workflows/release.yml

@@ -166,7 +166,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install kubectl
-        uses: azure/setup-kubectl@v3
+        uses: azure/setup-kubectl@v4
 
       - name: Install kustomize
         uses: imranismail/setup-kustomize@v2
@@ -208,7 +208,7 @@ jobs:
       contents: write
     steps:
       - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           generate_release_notes: true
 
@@ -224,7 +224,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install kubectl
-        uses: azure/setup-kubectl@v3
+        uses: azure/setup-kubectl@v4
 
       - name: Install kustomize
         uses: imranismail/setup-kustomize@v2

apps/api/src/app/app.module.ts

@@ -61,6 +61,8 @@ import { StatisticsModule } from '../statistics/statistics.module'
 import { AffiliateModule } from '../affiliate/affiliate.module'
 import { StripeModule } from '../stripe/stripe.module'
 
+import { LoggerModule } from '../logger/logger.module'
+
 @Module({
   imports: [
     ConfigModule.forRoot({
@@ -128,6 +130,7 @@ import { StripeModule } from '../stripe/stripe.module'
     CampaignNewsModule,
     CampaignNewsFileModule,
     MarketingNotificationsModule,
+    LoggerModule,
     StripeModule,
   ],
   controllers: [AppController],

apps/api/src/domain/generated/donation/dto/create-donation.dto.ts

@@ -1,7 +1 @@
-import { DonationType } from '@prisma/client'
-import { ApiProperty } from '@nestjs/swagger'
-
-export class CreateDonationDto {
-  @ApiProperty({ enum: DonationType })
-  type: DonationType
-}
+export class CreateDonationDto {}

apps/api/src/domain/generated/donation/dto/update-donation.dto.ts

@@ -1,7 +1 @@
-import { DonationType } from '@prisma/client'
-import { ApiProperty } from '@nestjs/swagger'
-
-export class UpdateDonationDto {
-  @ApiProperty({ enum: DonationType })
-  type?: DonationType
-}
+export class UpdateDonationDto {}

apps/api/src/logger/logger.module.ts

@@ -0,0 +1,8 @@
+import { Module } from '@nestjs/common'
+import { MyLogger } from './logger'
+
+@Module({
+  providers: [MyLogger],
+  exports: [MyLogger],
+})
+export class LoggerModule {}

apps/api/src/logger/logger.ts

@@ -0,0 +1,16 @@
+import { ConsoleLogger, Injectable } from '@nestjs/common'
+import { InjectSentry, SentryService } from '@ntegral/nestjs-sentry'
+
+@Injectable()
+export class MyLogger extends ConsoleLogger {
+  constructor(@InjectSentry() private readonly client: SentryService) {
+    super()
+  }
+
+  error(message: any, stack?: string, context?: string) {
+    // add your tailored logic here
+
+    this.client.instance().captureMessage(message, 'error')
+    super.error(message, stack, context)
+  }
+}

apps/api/src/main.ts

@@ -8,6 +8,8 @@ import { setupSwagger } from './config/swagger.config'
 import { setupExceptions } from './config/exceptions.config'
 import { setupValidation } from './config/validation.config'
 import { setupShutdownHooks } from './config/shutdown.config'
+import { MyLogger } from './logger/logger'
+import { LoggerModule } from './logger/logger.module'
 
 const globalPrefix = process.env.GLOBAL_PREFIX ?? 'api/v1'
 const logLevels: LogLevel[] = ['error', 'warn']
@@ -26,6 +28,7 @@ async function bootstrap() {
 
   app.setGlobalPrefix(globalPrefix)
   app.enableVersioning({ type: VersioningType.URI })
+  app.useLogger(app.get(MyLogger))
 
   const appVersion = process.env.APP_VERSION || 'unknown'
   setupHelmet(app)

apps/api/src/tasks/bank-import/import-transactions.task.ts

@@ -1,5 +1,5 @@
 import { HttpService } from '@nestjs/axios'
-import { Logger, Injectable } from '@nestjs/common'
+import { Logger, Injectable, BadRequestException } from '@nestjs/common'
 import { ConfigService } from '@nestjs/config'
 import { SchedulerRegistry } from '@nestjs/schedule'
 import {
@@ -278,7 +278,7 @@ export class IrisTasks {
     const endpoint = this.config.get<string>('iris.transactionsEndPoint', '')
 
     const dateFrom = DateTime.fromJSDate(transactionsDate)
-    const dateTo = dateFrom.plus({ days: 1 })
+    const dateTo = dateFrom
 
     Logger.debug(
       `Getting transactions from date: ${dateFrom.toISODate()} to date: ${dateTo.toISODate()}`,

migrations/20240515124820_change_bank_transaction_description_to_text/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "bank_transactions" ALTER COLUMN "description" SET DATA TYPE TEXT;

migrations/20240517165753_set_default_donation_type/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "donations" ALTER COLUMN "type" SET DEFAULT 'donation';

podkrepi.dbml

@@ -393,7 +393,7 @@ Table payments {
 Table donations {
   id String [pk]
   paymentId String [not null]
-  type DonationType [not null]
+  type DonationType [not null, default: 'donation']
   targetVaultId String [not null, note: 'Vault where the funds are going']
   amount Int [not null, default: 0]
   personId String

schema.prisma

@@ -475,7 +475,7 @@ model Donation {
   id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
 
   paymentId     String            @map("payment_id") @db.Uuid
-  type          DonationType
+  type          DonationType      @default(donation)
   /// Vault where the funds are going
   targetVaultId String            @map("target_vault_id") @db.Uuid
   amount        Int               @default(0)
@@ -625,7 +625,7 @@ model BankTransaction {
   recipientIban      String?             @map("recipient_iban") @db.VarChar(34)
   amount             Float               @default(0)
   currency           Currency            @default(BGN)
-  description        String              @db.VarChar(200)
+  description        String              @db.Text
   //Matched campaign payment code
   matchedRef         String?             @map("matched_ref") @db.VarChar(100)
   type               BankTransactionType

yarn.lock

@@ -8217,13 +8217,13 @@ __metadata:
   linkType: hard
 
 "ejs@npm:^3.1.7":
-  version: 3.1.9
-  resolution: "ejs@npm:3.1.9"
+  version: 3.1.10
+  resolution: "ejs@npm:3.1.10"
   dependencies:
     jake: ^10.8.5
   bin:
     ejs: bin/cli.js
-  checksum: af6f10eb815885ff8a8cfacc42c6b6cf87daf97a4884f87a30e0c3271fedd85d76a3a297d9c33a70e735b97ee632887f85e32854b9cdd3a2d97edf931519a35f
+  checksum: ce90637e9c7538663ae023b8a7a380b2ef7cc4096de70be85abf5a3b9641912dde65353211d05e24d56b1f242d71185c6d00e02cb8860701d571786d92c71f05
   languageName: node
   linkType: hard