[Fix] AI 요약이 제대로 응답하지 않던 오류 수정

boostcampwm-2024 · Dec 4, 2024 · 231c3a7 · 231c3a7
2 parents 2d617d2 + f0930e9
commit 231c3a7
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 42 deletions.
diff --git a/apps/api/src/entity/summary.entity.ts b/apps/api/src/entity/summary.entity.ts
@@ -17,7 +17,7 @@ export class Summary {
   @Column('varchar')
   audioUrl: string;
 
-  @Column('json', { nullable: true })
+  @Column('text', { nullable: true })
   summaryText: string[];
 
   @CreateDateColumn({ type: 'timestamp', name: 'created_at' })

diff --git a/apps/api/src/stream/stream.controller.ts b/apps/api/src/stream/stream.controller.ts
@@ -19,7 +19,7 @@ export class StreamController {
 
   @Get('summary/:ticleId')
   async getSummaryByTicleId(@Param('ticleId') ticleId: number) {
-    const text = await this.streamService.getSummaryText(ticleId);
-    return { summary: text };
+    const summary = await this.streamService.getSummary(ticleId);
+    return summary;
   }
 }
diff --git a/apps/api/src/stream/stream.service.ts b/apps/api/src/stream/stream.service.ts
@@ -103,11 +103,12 @@ export class StreamService {
     }
   }
 
-  async getSummaryText(ticleId: number) {
+  async getSummary(ticleId: number) {
     const summary = await this.summaryRepository.findOne({
       where: { ticle: { id: ticleId } },
     });
-    return summary.summaryText;
+
+    return summary;
   }
 
   async updateSummaryText(summary: Summary, summaryText: string[]) {

diff --git a/apps/web/src/components/dashboard/AiSummaryDialog.tsx b/apps/web/src/components/dashboard/AiSummaryDialog.tsx
@@ -17,15 +17,23 @@ function AiSummaryDialog({ isOpen, onClose, ticleId }: AiSummaryDialogProps) {
       <Dialog.Title align="center">AI 음성 요약</Dialog.Title>
       <Dialog.Close onClose={onClose} />
       <Dialog.Content className="custom-scrollbar overflow-y-scroll">
-        {!data || data?.summary.length === 0 ? (
+        {!data && (
           <div className="flex h-[20rem] w-full flex-col items-center justify-center gap-10">
             <Loading color="primary" />
             <span className="whitespace-pre text-center text-title1 text-primary">
               AI 요약을 처리중이에요.
             </span>
           </div>
-        ) : (
-          <p className="whitespace-pre text-body1">{data?.summary[0]}</p>
+        )}
+        {data && !data.summaryText && (
+          <div className="flex h-[20rem] w-full flex-col items-center justify-center gap-10">
+            <span className="whitespace-pre text-center text-title1 text-primary">
+              AI 요약 결과가 없어요.
+            </span>
+          </div>
+        )}
+        {data && data.summaryText && (
+          <p className="whitespace-pre text-body1">{data.summaryText}</p>
         )}
       </Dialog.Content>
     </Dialog.Root>

diff --git a/apps/web/src/components/live/SettingDialog/SelectMedia.tsx b/apps/web/src/components/live/SettingDialog/SelectMedia.tsx
@@ -18,7 +18,7 @@ function SelectMedia() {
 
       stream?.getTracks().forEach((track) => track.stop());
 
-      const cameraStream = await getCameraStream({ video: { deviceId: selectedVideoDeviceId } });
+      const cameraStream = await getCameraStream({ deviceId: selectedVideoDeviceId });
 
       videoRef.current.srcObject = cameraStream;
 
@@ -28,6 +28,12 @@ function SelectMedia() {
     getStream();
   }, [selectedVideoDeviceId]);
 
+  useEffect(() => {
+    return () => {
+      stream?.getTracks().forEach((track) => track.stop());
+    };
+  }, [stream]);
+
   return (
     <div className="flex h-full flex-col gap-y-4 overflow-y-auto">
       <div>

diff --git a/apps/web/src/hooks/useMediaTracks.ts b/apps/web/src/hooks/useMediaTracks.ts
@@ -31,43 +31,25 @@ const useMediaTracks = () => {
   );
 
   const getCameraTrack = async () => {
-    if (!selectedVideoDeviceId) {
-      return;
-    }
+    const options = selectedVideoDeviceId ? { deviceId: selectedVideoDeviceId } : {};
 
-    const stream = await getCameraStream({
-      video: { deviceId: selectedVideoDeviceId },
-    });
+    const stream = await getCameraStream(options);
     const track = stream.getVideoTracks()[0];
-
-    if (!track) {
-      return;
-    }
+    if (!track) return;
 
     setVideo({ stream, paused: true });
 
     return track;
   };
 
   const getAudioTrack = async () => {
-    if (!selectedAudioDeviceId) {
-      return;
-    }
+    const options = selectedAudioDeviceId ? { deviceId: selectedAudioDeviceId } : {};
 
-    const stream = await getMicStream({
-      audio: {
-        deviceId: {
-          exact: selectedAudioDeviceId,
-          ideal: selectedAudioDeviceId,
-        },
-      },
-    });
+    const stream = await getMicStream(options);
 
     const track = stream.getAudioTracks()[0];
 
-    if (!track) {
-      return;
-    }
+    if (!track) return;
 
     setAudio({ stream, paused: true });
 
@@ -83,9 +65,7 @@ const useMediaTracks = () => {
 
     const track = stream.getVideoTracks()[0];
 
-    if (!track) {
-      return;
-    }
+    if (!track) return;
 
     setScreen({ stream, paused: false });
 

diff --git a/apps/web/src/utils/stream.ts b/apps/web/src/utils/stream.ts
@@ -19,7 +19,7 @@ const DEFAULT_SCREEN_CONSTRAINTS: MediaTrackConstraints = {
   frameRate: { max: 30, ideal: 15 },
 };
 
-const getCameraStream = async (options: MediaStreamConstraints = {}) => {
+const getCameraStream = async (options: MediaTrackConstraints = {}) => {
   return navigator.mediaDevices.getUserMedia({
     video: {
       ...DEFAULT_VIDEO_CONSTRAINTS,
@@ -28,7 +28,7 @@ const getCameraStream = async (options: MediaStreamConstraints = {}) => {
   });
 };
 
-const getMicStream = async (options: MediaStreamConstraints = {}) => {
+const getMicStream = async (options: MediaTrackConstraints = {}) => {
   return navigator.mediaDevices.getUserMedia({
     audio: {
       ...DEFAULT_AUDIO_CONSTRAINTS,
@@ -37,7 +37,7 @@ const getMicStream = async (options: MediaStreamConstraints = {}) => {
   });
 };
 
-const getScreenStream = async (options: MediaStreamConstraints = {}) => {
+const getScreenStream = async (options: MediaTrackConstraints = {}) => {
   return navigator.mediaDevices.getDisplayMedia({
     video: {
       ...DEFAULT_SCREEN_CONSTRAINTS,

diff --git a/packages/types/src/dashboard/getDashboardList.ts b/packages/types/src/dashboard/getDashboardList.ts
@@ -62,8 +62,13 @@ export const DashboardApplicantsResponseSchema = z.array(
 
 export type DashboardApplicantsResponse = z.infer<typeof DashboardApplicantsResponseSchema>;
 
-export const DashboardAiSummaryResponseSchema = z.object({
-  summary: z.array(z.string()),
-});
+export const DashboardAiSummaryResponseSchema = z
+  .object({
+    id: z.number(),
+    summaryText: z.string().nullable(),
+    audioUrl: z.string(),
+    createdAt: z.string().datetime(),
+  })
+  .nullable();
 
 export type DashboardAiSummaryResponse = z.infer<typeof DashboardAiSummaryResponseSchema>;