Develop to master

package.json

@@ -56,6 +56,7 @@
     "cross-env": "^7.0.3",
     "crypto-js": "^4.1.1",
     "form-data": "^4.0.0",
+    "groq-sdk": "^0.15.0",
     "ioredis": "^5.3.2",
     "joi": "^17.6.0",
     "openai": "^4.80.0",

src/ai/ai.service.ts

@@ -0,0 +1,10 @@
+export interface AiService {
+  chat(chatRequest: {
+    messages: any[];
+    model: string;
+    temperature: number;
+    responseType: string;
+  }): Promise<string | null>;
+}
+
+export const AiService = Symbol('AiService');

src/ai/groq/groq.service.ts

@@ -0,0 +1,37 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import Groq from 'groq-sdk';
+import { AiService } from '../ai.service';
+
+@Injectable()
+export class GroqService implements AiService {
+  private readonly groq: Groq;
+
+  constructor(private readonly configService: ConfigService) {
+    this.groq = new Groq({
+      apiKey: this.configService.get('GROQ_API_KEY'),
+    });
+  }
+  async chat({
+    messages,
+    model,
+    temperature,
+    responseType,
+  }: {
+    messages: any[];
+    model: string;
+    temperature: number;
+    responseType: string;
+  }): Promise<string | null> {
+    const response = await this.groq.chat.completions.create({
+      messages,
+      model,
+      temperature,
+      response_format: {
+        type: responseType as 'text' | 'json_object' | undefined,
+      },
+    });
+
+    return response.choices[0].message.content;
+  }
+}

src/ai/openai.module.ts

@@ -0,0 +1,9 @@
+import { Module } from '@nestjs/common';
+import { GroqService } from './groq/groq.service';
+import { AiService } from './ai.service';
+
+@Module({
+  providers: [{ provide: AiService, useClass: GroqService }],
+  exports: [{ provide: AiService, useClass: GroqService }],
+})
+export class AiModule {}

src/openai/openai.service.ts → src/ai/openai/openai.service.ts

@@ -1,12 +1,16 @@
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 
-import { CreateCompletionBodyDto } from './dto/create-completion.dto';
 import OpenAI from 'openai';
-import { ChatCompletion } from 'openai/resources';
+import {
+  ResponseFormatJSONObject,
+  ResponseFormatJSONSchema,
+  ResponseFormatText,
+} from 'openai/resources';
+import { AiService } from '../ai.service';
 
 @Injectable()
-export class OpenaiService {
+export class OpenaiService implements AiService {
   private readonly openAIApi: OpenAI;
   constructor(private readonly configService: ConfigService) {
     this.openAIApi = new OpenAI({
@@ -15,26 +19,31 @@ export class OpenaiService {
     });
   }
 
-  async createChatCompletion({
-    question,
+  async chat({
+    messages,
     model,
     temperature,
     responseType,
-  }: CreateCompletionBodyDto): Promise<ChatCompletion> {
+  }: {
+    messages: any[];
+    model: string;
+    temperature: number;
+    responseType: string;
+  }): Promise<string | null> {
     try {
       const response = await this.openAIApi.chat.completions.create({
         model: model || 'gpt-4o-mini',
-        messages: [
-          {
-            role: 'user',
-            content: question,
-          },
-        ],
+        messages,
         temperature: temperature || 0.1,
-        ...(responseType && { response_format: responseType }),
+        ...(responseType && {
+          response_format: responseType as unknown as
+            | ResponseFormatText
+            | ResponseFormatJSONObject
+            | ResponseFormatJSONSchema,
+        }),
       });
 
-      return response;
+      return response.choices[0].message.content;
     } catch (e) {
       throw e;
     }

src/app.module.ts

@@ -12,7 +12,7 @@ import { CollectionsModule } from './collections/collections.module';
 import { BatchModule } from './batch/batch.module';
 import { SummaryModule } from './summary/summary.module';
 import { TypeOrmConfigService } from './database/typerom-config.service';
-import { OpenaiModule } from './openai/openai.module';
+import { AiModule } from './ai/openai.module';
 import { AppController } from './app.controller';
 import { AopModule } from './common/aop/aop.module';
 import { InfraModule } from './infra/infra.module';
@@ -106,7 +106,6 @@ import { InfraModule } from './infra/infra.module';
         ? process.env.NAVER_CLOVA_SUMMARY_REQUEST_URL
         : '',
     }),
-    OpenaiModule,
     AopModule,
     InfraModule,
   ],

src/auth/oauth.controller.ts

@@ -130,13 +130,4 @@ export class OAuthController {
   async appleLogin(@Query('code') code: string): Promise<LoginOutput> {
     return this.oauthService.appleLogin(code);
   }
-
-  @ApiOperation({
-    summary: '카카오 로그인 요청',
-    description: 'accessToken을 받아 카카오 로그인을 요청합니다.',
-  })
-  @Post('kakao')
-  async createOneWithKakao(@Body() kakaoLoginRequest: KakaoLoginRequest) {
-    return this.oauthService.createOneWithKakao(kakaoLoginRequest);
-  }
 }

src/auth/oauth.service.ts

@@ -34,9 +34,12 @@ export class OAuthService {
   ) {}
 
   // OAuth Login
-  async oauthLogin(email: string): Promise<LoginOutput> {
+  async oauthLogin(email: string, provider: PROVIDER): Promise<LoginOutput> {
     try {
-      const user: User = await this.userRepository.findOneByOrFail({ email });
+      const user: User = await this.userRepository.findOneByOrFail({
+        email,
+        provider,
+      });
       if (user) {
         const payload: Payload = this.jwtService.createPayload(
           user.email,
@@ -98,9 +101,12 @@ export class OAuthService {
         throw new BadRequestException('Please Agree to share your email');
       }
 
-      const user = await this.userRepository.findOneByEmail(email);
+      const user = await this.userRepository.findOneByEmailAndProvider(
+        email,
+        PROVIDER.KAKAO,
+      );
       if (user) {
-        return this.oauthLogin(user.email);
+        return this.oauthLogin(user.email, PROVIDER.KAKAO);
       }
 
       // 회원가입인 경우 기본 카테고리 생성 작업 진행
@@ -115,51 +121,25 @@ export class OAuthService {
       await this.userRepository.createOne(newUser);
       await this.categoryRepository.createDefaultCategories(newUser);
 
-      return this.oauthLogin(newUser.email);
+      return this.oauthLogin(newUser.email, PROVIDER.KAKAO);
     } catch (e) {
       throw e;
     }
   }
 
-  async createOneWithKakao({ authorizationToken }: KakaoLoginDto) {
-    const { userInfo } =
-      await this.oauthUtil.getKakaoUserInfo(authorizationToken);
-
-    const email = userInfo.kakao_account.email;
-    if (!email) {
-      throw new BadRequestException('Please Agree to share your email');
-    }
-
-    const user = await this.userRepository.findOneByEmail(email);
-
-    if (user) {
-      return this.oauthLogin(user.email);
-    }
-
-    // 회원가입인 경우 기본 카테고리 생성 작업 진행
-    const newUser = User.of({
-      email,
-      name: userInfo.kakao_account.profile.nickname,
-      profileImage: userInfo.kakao_account.profile?.profile_image_url,
-      password: this.encodePasswordFromEmail(email, process.env.KAKAO_JS_KEY),
-      provider: PROVIDER.KAKAO,
-    });
-
-    await this.userRepository.createOne(newUser);
-    await this.categoryRepository.createDefaultCategories(newUser);
-    return this.oauthLogin(newUser.email);
-  }
-
   // Login with Google account info
   async googleOauth({
     email,
     name,
     picture,
   }: googleUserInfo): Promise<LoginOutput> {
-    const user = await this.userRepository.findOneByEmail(email);
+    const user = await this.userRepository.findOneByEmailAndProvider(
+      email,
+      PROVIDER.GOOGLE,
+    );
 
     if (user) {
-      return this.oauthLogin(user.email);
+      return this.oauthLogin(user.email, PROVIDER.GOOGLE);
     }
 
     // 회원가입인 경우 기본 카테고리 생성 작업 진행
@@ -177,7 +157,7 @@ export class OAuthService {
     await this.userRepository.createOne(newUser);
     await this.categoryRepository.createDefaultCategories(newUser);
 
-    return this.oauthLogin(newUser.email);
+    return this.oauthLogin(newUser.email, PROVIDER.GOOGLE);
   }
 
   private encodePasswordFromEmail(email: string, key?: string): string {
@@ -225,10 +205,13 @@ export class OAuthService {
 
     const { sub: id, email } = this.jwtService.decode(data.id_token);
 
-    const user = await this.userRepository.findOneByEmail(email);
+    const user = await this.userRepository.findOneByEmailAndProvider(
+      email,
+      PROVIDER.APPLE,
+    );
 
     if (user) {
-      return this.oauthLogin(user.email);
+      return this.oauthLogin(user.email, PROVIDER.APPLE);
     }
 
     const newUser = User.of({
@@ -244,6 +227,6 @@ export class OAuthService {
     await this.userRepository.createOne(newUser);
     await this.categoryRepository.createDefaultCategories(newUser);
 
-    return this.oauthLogin(newUser.email);
+    return this.oauthLogin(newUser.email, PROVIDER.APPLE);
   }
 }

src/categories/category.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 import { ContentsModule } from '../contents/contents.module';
 import { CategoryService } from './category.service';
-import { OpenaiModule } from '../openai/openai.module';
+import { AiModule } from '../ai/openai.module';
 import { UsersModule } from '../users/users.module';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Category } from './category.entity';
@@ -14,7 +14,7 @@ import { CategoryV2Controller } from './v2/category.v2.controller';
   imports: [
     TypeOrmModule.forFeature([Category]),
     ContentsModule,
-    OpenaiModule,
+    AiModule,
     UsersModule,
   ],
   controllers: [CategoryController, CategoryV2Controller],