Merge pull request #504 from Team-WeQuiz/feat/#493

[ML] 코드 리팩토링,. 메모리 약간 최적화

.github/workflows/fe-docker-buildx-ci.yml

@@ -52,6 +52,5 @@ jobs:
           build-args: |
             AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY }}
             AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }}
-            NEXT_PUBLIC_GOOGLE_ANALYTICS_ID=${{ secrets.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID }}
           cache-from: type=gha
           cache-to: type=gha, mode=max

README.md

@@ -89,7 +89,7 @@ AI가 생성한 퀴즈를 친구들과 함께 푸는 서비스
 </br>
 
 ## 🎮 Demo
-[![Video Label](http://img.youtube.com/vi/_8EoD0a8urQ/0.jpg)](https://www.youtube.com/watch?v=L84IS3E5d7Y)
+준비 중...
 
 </br>
 </br>

chatty-be/src/main/java/com/chatty/chatty/game/exception/ModelExceptionType.java

@@ -5,11 +5,8 @@
 
 public enum ModelExceptionType implements ExceptionType {
 
-    INSUFFICIENT_TOKENS(Status.BAD_REQUEST, 9001, "토큰이 적어서 요청을 처리할 수 없습니다"),
-    TOO_MANY_TOKENS(Status.BAD_REQUEST, 9002, "토큰이 너무 많아서 요청을 처리할 수 없습니다"),
-    TOO_MANY_PAGES(Status.BAD_REQUEST, 9003, "페이지가 너무 많아서 요청을 처리할 수 없습니다"),
-    FILE_NOT_AVAILABLE(Status.BAD_REQUEST, 9004, "사용할 수 없는 파일입니다"),
-    FAILED_TO_CREATE(Status.SERVER_ERROR, 9005, "서버에서 퀴즈를 생성하는데 실패했습니다");
+    //토큰이 적을때 오류
+    LACK_OF_TOKEN(Status.BAD_REQUEST, 9001, "토큰이 적어서 요청을 처리할 수 없습니다");
 
     private final Status status;
     private final int exceptionCode;

chatty-be/src/main/java/com/chatty/chatty/game/service/model/ModelService.java

@@ -1,15 +1,7 @@
 package com.chatty.chatty.game.service.model;
 
-import static com.chatty.chatty.game.exception.ModelExceptionType.FAILED_TO_CREATE;
-import static com.chatty.chatty.game.exception.ModelExceptionType.FILE_NOT_AVAILABLE;
-import static com.chatty.chatty.game.exception.ModelExceptionType.INSUFFICIENT_TOKENS;
-import static com.chatty.chatty.game.exception.ModelExceptionType.TOO_MANY_PAGES;
-import static com.chatty.chatty.game.exception.ModelExceptionType.TOO_MANY_TOKENS;
-import static org.springframework.http.HttpStatus.BAD_REQUEST;
+import static com.chatty.chatty.game.exception.ModelExceptionType.LACK_OF_TOKEN;
 import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
-import static org.springframework.http.HttpStatus.PAYLOAD_TOO_LARGE;
-import static org.springframework.http.HttpStatus.REQUESTED_RANGE_NOT_SATISFIABLE;
-import static org.springframework.http.HttpStatus.UNPROCESSABLE_ENTITY;
 import static org.springframework.http.MediaType.APPLICATION_JSON;
 
 import com.chatty.chatty.config.minio.MinioRepository;
@@ -53,31 +45,7 @@ public QuizDocIdMLResponse requestQuizDocId(
                 .onStatus(INTERNAL_SERVER_ERROR::equals,
                         (req, res) -> {
                             minioRepository.deleteFiles(fileNames);
-                            throw new ModelException(FAILED_TO_CREATE);
-                        }
-                )
-                .onStatus(UNPROCESSABLE_ENTITY::equals,
-                        (req, res) -> {
-                            minioRepository.deleteFiles(fileNames);
-                            throw new ModelException(INSUFFICIENT_TOKENS);
-                        }
-                )
-                .onStatus(PAYLOAD_TOO_LARGE::equals,
-                        (req, res) -> {
-                            minioRepository.deleteFiles(fileNames);
-                            throw new ModelException(TOO_MANY_TOKENS);
-                        }
-                )
-                .onStatus(REQUESTED_RANGE_NOT_SATISFIABLE::equals,
-                        (req, res) -> {
-                            minioRepository.deleteFiles(fileNames);
-                            throw new ModelException(TOO_MANY_PAGES);
-                        }
-                )
-                .onStatus(BAD_REQUEST::equals,
-                        (req, res) -> {
-                            minioRepository.deleteFiles(fileNames);
-                            throw new ModelException(FILE_NOT_AVAILABLE);
+                            throw new ModelException(LACK_OF_TOKEN);
                         }
                 )
                 .body(QuizDocIdMLResponse.class);

chatty-fe/Dockerfile

@@ -15,11 +15,9 @@ COPY . .
 
 ARG AWS_ACCESS_KEY_ID
 ARG AWS_SECRET_ACCESS_KEY
-ARG NEXT_PUBLIC_GOOGLE_ANALYTICS_ID
 
 ENV AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
 ENV AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
-ENV NEXT_PUBLIC_GOOGLE_ANALYTICS_ID=${NEXT_PUBLIC_GOOGLE_ANALYTICS_ID}
 
 RUN npm run build
 

chatty-fe/package.json

@@ -14,7 +14,6 @@
     "@aws-sdk/client-s3": "^3.511.0",
     "@aws-sdk/client-secrets-manager": "^3.543.0",
     "@aws-sdk/s3-request-presigner": "^3.511.0",
-    "@next/third-parties": "^14.2.3",
     "@stomp/stompjs": "^7.0.0",
     "@types/formidable": "^3.4.5",
     "@types/sockjs-client": "^1.5.4",

chatty-fe/src/app/layout.tsx

@@ -4,7 +4,6 @@ import './globals.css';
 import './layout.css';
 import { Suspense } from 'react';
 import BgmComponent from './_components/BgmComponent/BgmComponent';
-import { GoogleAnalytics } from '@next/third-parties/google';
 
 const pretendard = localFont({
   src: '../../public/fonts/PretendardVariable.ttf',
@@ -43,9 +42,6 @@ export default function RootLayout({
           </Suspense>
         </div>
       </body>
-      {process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID ? (
-        <GoogleAnalytics gaId={process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS_ID} />
-      ) : null}
     </html>
   );
 }