Merge pull request #1637 from line/dev

release: 7.2522.91

Author: jihun

.github/workflows/integration-test.yml

@@ -36,9 +36,9 @@ jobs:
         image: opensearchproject/opensearch:2.17.1
         env:
           discovery.type: single-node
-          bootstrap.memory_lock: "true"
-          plugins.security.disabled: "true"
-          OPENSEARCH_INITIAL_ADMIN_PASSWORD: "UserFeedback123!@#"
+          bootstrap.memory_lock: 'true'
+          plugins.security.disabled: 'true'
+          OPENSEARCH_INITIAL_ADMIN_PASSWORD: 'UserFeedback123!@#'
         options: >-
           --health-cmd="curl -s http://localhost:9200/_cluster/health | grep -q '\"status\":\"green\"'"
           --health-interval=10s
@@ -54,6 +54,7 @@ jobs:
       - name: Setup integration test (with opensearch)
         run: |
           npm install -g corepack@latest
+          corepack enable
           pnpm install --frozen-lockfile
           pnpm build
           echo "BASE_URL=http://localhost:3000" >> ./apps/api/.env

.npmrc

@@ -1,4 +1 @@
-node-linker=hoisted
-hoist-pattern[]=!bcrypt
-# hoist-pattern[]=!*typeorm*
-# hoist-pattern[]=!*nestjs*
+node-linker=hoisted

.nvmrc

@@ -1 +1 @@
-22.14.0
+22.16.0

apps/api/integration-test/test-specs/feedback.integration-spec.ts

@@ -385,7 +385,7 @@ describe('FeedbackController (integration)', () => {
           {
             key: 'createdAt',
             value: {
-              gte: DateTime.fromJSDate(new Date(0)).toFormat('yyyy-MM-dd'),
+              gte: DateTime.now().minus({ years: 1 }).toFormat('yyyy-MM-dd'),
               lt: DateTime.now().toFormat('yyyy-MM-dd'),
             },
             condition: QueryV2ConditionsEnum.BETWEEN,

apps/api/integration-test/test-specs/tenant.integration-spec.ts

@@ -32,7 +32,11 @@ import {
 import type { GetTenantResponseDto } from '@/domains/admin/tenant/dtos/responses';
 import { TenantEntity } from '@/domains/admin/tenant/tenant.entity';
 import { UserEntity } from '@/domains/admin/user/entities/user.entity';
-import { clearAllEntities, signInTestUser } from '@/test-utils/util-functions';
+import {
+  clearAllEntities,
+  clearEntities,
+  signInTestUser,
+} from '@/test-utils/util-functions';
 import { HttpStatusCode } from '@/types/http-status';
 
 describe('TenantController (integration)', () => {
@@ -102,7 +106,7 @@ describe('TenantController (integration)', () => {
     });
 
     afterAll(async () => {
-      await tenantRepo.delete({});
+      await clearEntities([tenantRepo]);
     });
   });
 
@@ -137,7 +141,7 @@ describe('TenantController (integration)', () => {
         });
     });
     it('should fail to find a tenant', async () => {
-      await tenantRepo.delete({});
+      await clearEntities([tenantRepo]);
 
       const dto = new UpdateTenantRequestDto();
 
@@ -166,8 +170,7 @@ describe('TenantController (integration)', () => {
   describe('/admin/tenants (GET)', () => {
     const dto = new SetupTenantRequestDto();
     beforeEach(async () => {
-      await tenantRepo.delete({});
-      await userRepo.delete({});
+      await clearEntities([tenantRepo, userRepo]);
       dto.siteName = faker.string.sample();
       dto.password = '12345678';
 

apps/api/package.json

@@ -40,22 +40,20 @@
     "@nestjs/passport": "^11.0.0",
     "@nestjs/platform-express": "^11.0.0",
     "@nestjs/platform-fastify": "^11.0.0",
-    "@nestjs/schedule": "^5.0.0",
+    "@nestjs/schedule": "^6.0.0",
     "@nestjs/swagger": "^11.0.0",
     "@nestjs/terminus": "^11.0.0",
     "@nestjs/typeorm": "^11.0.0",
     "@opensearch-project/opensearch": "^3.0.0",
-    "@swc/cli": "^0.6.0",
-    "@swc/helpers": "^0.5.10",
     "@types/passport-jwt": "^4.0.1",
     "@types/passport-local": "^1.0.38",
     "@ufb/shared": "workspace:*",
     "@willsoto/nestjs-prometheus": "^6.0.0",
     "axios": "^1.7.2",
-    "bcrypt": "^5.1.1",
+    "bcrypt": "^6.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
-    "cron": "^3.5.0",
+    "cron": "^4.3.0",
     "dotenv": "^16.4.5",
     "exceljs": "^4.4.0",
     "fast-csv": "^5.0.1",
@@ -67,7 +65,7 @@
     "nestjs-cls": "^5.0.0",
     "nestjs-pino": "^4.0.0",
     "nestjs-typeorm-paginate": "^4.0.4",
-    "nodemailer": "^6.9.13",
+    "nodemailer": "^7.0.0",
     "passport": "^0.7.0",
     "passport-custom": "^1.1.1",
     "passport-jwt": "^4.0.1",
@@ -89,12 +87,14 @@
     "@nestjs/schematics": "^11.0.0",
     "@nestjs/testing": "^11.0.0",
     "@swc-node/jest": "^1.8.0",
+    "@swc/cli": "0.7.7",
     "@swc/core": "^1.4.16",
+    "@swc/helpers": "^0.5.10",
     "@types/bcrypt": "^5.0.2",
     "@types/express": "^5.0.0",
     "@types/jest": "^29.5.12",
     "@types/luxon": "^3.4.2",
-    "@types/node": "22.14.0",
+    "@types/node": "22.15.23",
     "@types/nodemailer": "^6.4.15",
     "@types/passport-jwt": "*",
     "@types/supertest": "^6.0.2",

apps/api/src/common/repositories/opensearch.repository.ts

@@ -21,9 +21,11 @@ import {
   Inject,
   Injectable,
   InternalServerErrorException,
+  Logger,
   NotFoundException,
 } from '@nestjs/common';
 import { Client, errors } from '@opensearch-project/opensearch';
+import { Indices_PutMapping_Response } from '@opensearch-project/opensearch/api';
 
 import type {
   CreateDataDto,
@@ -38,38 +40,55 @@ import { LargeWindowException } from './large-window.exception';
 
 @Injectable()
 export class OpensearchRepository {
+  private logger = new Logger(OpensearchRepository.name);
   private opensearchClient: Client;
   constructor(@Inject('OPENSEARCH_CLIENT') opensearchClient: Client) {
     this.opensearchClient = opensearchClient;
   }
 
   async createIndex({ index }: CreateIndexDto) {
     const indexName = 'channel_' + index;
-    await this.opensearchClient.indices.create({
-      index: indexName,
-      body: {
-        settings: {
-          index: { max_ngram_diff: 1 },
-          analysis: {
-            analyzer: {
-              ngram_analyzer: {
-                type: 'custom',
-                filter: ['lowercase', 'asciifolding', 'cjk_width'],
-                tokenizer: 'ngram_tokenizer',
+    try {
+      const response = await this.opensearchClient.indices.create({
+        index: indexName,
+        body: {
+          settings: {
+            index: { max_ngram_diff: 1 },
+            analysis: {
+              analyzer: {
+                ngram_analyzer: {
+                  type: 'custom',
+                  filter: ['lowercase', 'asciifolding', 'cjk_width'],
+                  tokenizer: 'ngram_tokenizer',
+                },
               },
-            },
-            tokenizer: {
-              ngram_tokenizer: {
-                type: 'ngram',
-                min_gram: 1,
-                max_gram: 2,
-                token_chars: ['letter', 'digit', 'punctuation', 'symbol'],
+              tokenizer: {
+                ngram_tokenizer: {
+                  type: 'ngram',
+                  min_gram: 1,
+                  max_gram: 2,
+                  token_chars: ['letter', 'digit', 'punctuation', 'symbol'],
+                },
               },
             },
           },
         },
-      },
-    });
+      });
+      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+      if (response) {
+        this.logger.log(
+          `Index created successfully: ${JSON.stringify(response.body, null, 2)}`,
+        );
+      }
+    } catch (error) {
+      this.logger.log(`Error creating index: ${error}`);
+      if (error?.meta?.body) {
+        this.logger.log(
+          `OpenSearch error details:${JSON.stringify(error.meta.body, null, 2)}`,
+        );
+      }
+      throw error;
+    }
     await this.opensearchClient.indices.putAlias({
       index: indexName,
       name: index,
@@ -82,10 +101,23 @@ export class OpensearchRepository {
     });
     if (statusCode !== 200) throw new NotFoundException('index is not found');
 
-    return await this.opensearchClient.indices.putMapping({
-      index,
-      body: { properties: mappings },
-    });
+    let response: Indices_PutMapping_Response;
+    try {
+      response = await this.opensearchClient.indices.putMapping({
+        index,
+        body: { properties: mappings },
+      });
+    } catch (error) {
+      this.logger.log(`Error put mapping: ${error}`);
+      if (error?.meta?.body) {
+        this.logger.log(
+          `OpenSearch error details:${JSON.stringify(error.meta.body, null, 2)}`,
+        );
+      }
+      throw error;
+    }
+
+    return response;
   }
 
   async createData({ id, index, data }: CreateDataDto) {

apps/api/src/configs/modules/typeorm-config/migrations/1746153314386-add-search-max-days-on-channel.ts

@@ -0,0 +1,34 @@
+/**
+ * Copyright 2025 LY Corporation
+ *
+ * LY Corporation licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+import type { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddSearchMaxDaysOnChannel1746153314386
+  implements MigrationInterface
+{
+  name = 'AddSearchMaxDaysOnChannel1746153314386';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE \`channels\` ADD \`feedback_search_max_days\` int NOT NULL DEFAULT '365'`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE \`channels\` DROP COLUMN \`feedback_search_max_days\``,
+    );
+  }
+}

apps/api/src/domains/admin/channel/channel/channel.controller.spec.ts

@@ -54,6 +54,7 @@ describe('ChannelController', () => {
       const dto = new CreateChannelRequestDto();
       dto.name = faker.string.sample();
       dto.description = faker.string.sample();
+      dto.feedbackSearchMaxDays = faker.number.int();
       dto.fields = [];
 
       await channelController.create(projectId, dto);

apps/api/src/domains/admin/channel/channel/channel.entity.ts

@@ -53,6 +53,9 @@ export class ChannelEntity extends CommonEntity {
   @Column({ type: 'json', nullable: true })
   imageConfig: ImageConfig | null;
 
+  @Column('int', { default: 365 })
+  feedbackSearchMaxDays: number;
+
   @ManyToOne(() => ProjectEntity, (project) => project.channels, {
     onDelete: 'CASCADE',
   })
@@ -87,6 +90,7 @@ export class ChannelEntity extends CommonEntity {
     description: string | null,
     projectId: number,
     imageConfig: ImageConfig | null,
+    feedbackSearchMaxDays: number,
   ) {
     const channel = new ChannelEntity();
     channel.name = name;
@@ -98,6 +102,7 @@ export class ChannelEntity extends CommonEntity {
     }
     channel.project = new ProjectEntity();
     channel.project.id = projectId;
+    channel.feedbackSearchMaxDays = feedbackSearchMaxDays;
 
     return channel;
   }