Skip to content

deploy 3.2 #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
hknhj merged 31 commits into from
Aug 14, 2025
Merged

deploy 3.2 #233

hknhj merged 31 commits into from
Aug 14, 2025

Conversation

@hknhj
Copy link
Contributor

@hknhj hknhj commented Aug 14, 2025

๐Ÿ“์ž‘์—… ๋‚ด์šฉ

  • SNS ์ด๋ฒคํŠธ ์ฐธ์—ฌ์ž, ๋‹น์ฒจ์ž ๋ฆฌ์ŠคํŠธ ํŒŒ์ผ, ์ธ๋„ค์ผ ์ด๋ฏธ์ง€ S3์— ์—…๋กœ๋“œํ•˜๋Š” ๊ธฐ๋Šฅ ๋ฐ ๋ฆฌ์ŠคํŠธ ํŒŒ์ผ ๋‹ค์šด๋กœ๋“œ ๊ธฐ๋Šฅ ๊ตฌํ˜„
  • ๋ฌธ์„œ ์กฐํšŒ ์˜ค๋ฅ˜ ์ˆ˜์ •
  • ํด๋ผ์ด์–ธํŠธ์™€ ์›น์†Œ์ผ“ ์—ฐ๊ฒฐํ•ด์ œ ์‹œ, ์Œ์„ฑ ํŒŒ์ผ s3 ์—…๋กœ๋“œ, AI ํšŒ์˜๋ก ์ƒ์„ฑํ•˜๋Š” ๋กœ์ง ๊ตฌํ˜„
  • ๋ฉ”์ธํŽ˜์ด์ง€ ์ตœ๊ทผ ๋ฌธ์„œ ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„
  • ์›Œํฌ์ŠคํŽ˜์ด์Šค ์ดˆ๋Œ€ ํ›„ ๋ฆฌ๋””๋ ‰์…˜ url ์ˆ˜์ •

2ghrms and others added 30 commits August 11, 2025 03:20
@2ghrms
deploy/#185: cicd ๊ฒฝ๋กœ ๋ณ€๊ฒฝ
0daf628
@2ghrms
deploy/#185: cicd ๊ฒฝ๋กœ ๋ณ€๊ฒฝ ๋ฐ ๋„คํŠธ์›Œํฌ ์ถ”๊ฐ€
5adb19c
@2ghrms
deploy/#185: docker compose ๋„คํŠธ์›Œํฌ ์ถ”๊ฐ€
23cd75e
@hknhj
feat/#211: ์‹ค์‹œ๊ฐ„ stt ๋ณ‘๋ ฌ ์ฒ˜๋ฆฌ ๋ฐ ์˜ˆ์™ธ ์ฒ˜๋ฆฌ ์ถ”๊ฐ€
e28bf1a 
- ๊ฐ ์ฝ”๋“œ์— ๋Œ€ํ•ด ์ฃผ์„ ์ถ”๊ฐ€
- STT, scoring API ํ˜ธ์ถœํ•˜๋Š” ์ฝ”๋“œ๋งˆ๋‹ค ์˜ˆ์™ธ์ฒ˜๋ฆฌ๋ฅผ ํ•˜์—ฌ, ํ˜„์žฌ ์Œ์„ฑ ๋ฐ์ดํ„ฐ ์ฒ˜๋ฆฌ ๊ณผ์ •์—์„œ ์—๋Ÿฌ๊ฐ€ ๋ฐœ์ƒํ•ด๋„ ๋‹ค์Œ ๋ฐ์ดํ„ฐ ์ฒ˜๋ฆฌ ๊ณผ์ •์— ๋ฌธ์ œ๊ฐ€ ์—†๋„๋ก ์ˆ˜์ •
- flatMapSequential์„ ์‚ฌ์šฉํ•˜์—ฌ 1๋ฒˆ, 2๋ฒˆ ์Œ์„ฑ๋ฐ์ดํ„ฐ๊ฐ€ ์žˆ์„ ๋•Œ, 1๋ฒˆ ์Œ์„ฑ๋ฐ์ดํ„ฐ์— STT ์‹คํ–‰๋˜๊ณ  ์žˆ์„ ๋•Œ, 2๋ฒˆ ์Œ์„ฑ๋ฐ์ดํ„ฐ๊ฐ€ 1๋ฒˆ์— ๋Œ€ํ•œ STT๊ฐ€ ๋๋‚  ๋•Œ ๊นŒ์ง€ ๊ธฐ๋‹ค๋ฆฌ๋Š” ๊ฒƒ์ด ์•„๋‹Œ, 2๋ฒˆ ์Œ์„ฑ ๋ฐ์ดํ„ฐ์— ๋Œ€ํ•ด์„œ๋„ ๋ฐ”๋กœ STT๋ฅผ ์‹คํ–‰ํ•˜๋„๋ก ์ˆ˜์ •, ๊ฒฐ๊ณผ์˜ ์ˆœ์„œ๋Š” ๋ณด์žฅ
- ์Œ์„ฑ์ด ์‹œ์ž‘๋๋‹ค๊ณ  ํŒ๋‹จ๋์„ ๋•Œ, ์˜ค๋ฅ˜์— ์˜ํ•ด ์ด์ „ ์Œ์„ฑ ๋ฐ์ดํ„ฐ๊ฐ€ ๋‚จ์•„์žˆ์„ ๊ฒฝ์šฐ๋ฅผ ์œ„ํ•ด isTriggered๋ฉด ๋ฒ„ํผ๋ฅผ ๋น„์šฐ๊ณ  ๋‚˜์„œ ์Œ์„ฑ ๋ฐ์ดํ„ฐ๋ฅผ ๋ฒ„ํผ์— ์ €์žฅํ•˜๋„๋ก ์ˆ˜์ •
- ํด๋ผ์ด์–ธํŠธ์— speech segment๋ฅผ ์ „ํ•ด์ค„ ๋•Œ, speakerId๋„ ํ•จ๊ป˜ ์ „๋‹ฌํ•˜๋„๋ก ์ˆ˜์ •
@Jinho622
feat/#194: SNS ์ด๋ฒคํŠธ ์ฐธ์—ฌ์ž, ๋‹น์ฒจ์ž ๋ฆฌ์ŠคํŠธ ํŒŒ์ผ(PDF, Word)์€ ๋ฐ”์ดํŠธ ๋ฐฐ์—ด๋กœ ์ธ๋„ค์ผ์€ ์ด๋ฏธ์ง€๋กœ ์ƒ์„ฑ ํ›„โ€ฆ
ba225cc 
โ€ฆ S3์— ์—…๋กœ๋“œํ•˜๋Š” ๊ธฐ๋Šฅ ๊ตฌํ˜„

- ์ฐธ์—ฌ์ž, ๋‹น์ฒจ์ž ๋ฆฌ์ŠคํŠธ ํŒŒ์ผ๊ณผ ์ธ๋„ค์ผ ์ด๋ฏธ์ง€ S3์— ์—…๋กœ๋“œ ํ›„ ๊ฐ๊ฐ์˜ keyName์„ SnsEvent Entity์— ์ €์žฅ
- PDF ํŒŒ์ผ: Thymeleaf ํ…œํ”Œ๋ฆฟ์— ๋ฐ์ดํ„ฐ๋ฅผ ๋ฐ”์ธ๋”ฉํ•ด HTML๋กœ ๋ Œ๋”๋ง ํ›„ PDF๋กœ ๋ณ€ํ™˜
- Word ํŒŒ์ผ: ๋ฐ์ดํ„ฐ๊ฐ€ ํฌํ•จ๋œ ํ‘œ(Table)๋ฅผ ์ƒ์„ฑํ•ด ์ €์žฅ
- ์ธ๋„ค์ผ์€ ์ƒ์„ฑ๋œ ํŒŒ์ผ์„ ๊ธฐ๋ฐ˜์œผ๋กœ ์ด๋ฏธ์ง€ ๋ณ€ํ™˜ ํ›„ ์—…๋กœ๋“œ
@hknhj
feat/#211: AudioSessionBuffer์— ์žˆ๋Š” meeting์—์„œ ์•ˆ๊ฑด์ง€ ๊ฐ€์ ธ์˜ค๋„๋ก ์ˆ˜์ •
41673a8
@hknhj
Merge pull request #212 from HaRu-Developers/feat/#211-real-time-stt-โ€ฆ
4e7394e 
โ€ฆadd-parallel-process-and-exception

feat/#211: ์‹ค์‹œ๊ฐ„ stt ๋ณ‘๋ ฌ ์ฒ˜๋ฆฌ ๋ฐ ์˜ˆ์™ธ ์ฒ˜๋ฆฌ ์ถ”๊ฐ€
@hknhj
feat/#222: meeting entity์— ํšŒ์˜ ์‹œ์ž‘ ์‹œ๊ฐ„, ํšŒ์˜ ์Œ์„ฑ ํŒŒ์ผ key ์ปฌ๋Ÿผ ์ถ”๊ฐ€
bb10f63
@Jinho622
feat/#194: ๊ธฐ์กด์— ๋ฆฌ์ŠคํŠธ ํŒŒ์ผ์„ ๋ฐ”์ดํŠธ ๋ฐฐ์—ด๋กœ ๋ฐ˜ํ™˜ํ•˜๋˜ ๋ฐฉ์‹์˜ ๋‹ค์šด๋กœ๋“œ ๊ธฐ๋Šฅ์„ S3์— ์ €์žฅ๋œ ํŒŒ์ผ์˜ ๋‹ค์šด๋กœ๋“œ URLโ€ฆ
389b583 
โ€ฆ์„ ๋ฐ˜ํ™˜ํ•˜๋Š” ๋ฐฉ์‹์œผ๋กœ ๋ณ€๊ฒฝ

- DB์— ์ €์žฅ๋œ keyName์œผ๋กœ PresignedUrl์„ ๋งŒ๋“ค์–ด 10๋ถ„๊นŒ์ง€ ์œ ํšจํ•œ ๋‹ค์šด๋กœ๋“œ ๋งํฌ์ธ PresignedUrl์„ ํ”„๋ก ํŠธ์—”๋“œ์— ์ „๋‹ฌ
@hknhj
feat/#222: ํด๋ผ์ด์–ธํŠธ์™€ ์›น์†Œ์ผ“ ์—ฐ๊ฒฐ์ด ๋Š๊ธฐ๋ฉด ์ „์ฒด ํšŒ์˜ ์Œ์„ฑ ํŒŒ์ผ์„ s3์— ์—…๋กœ๋“œํ•˜๋„๋ก ๊ตฌํ˜„
9c1b0a9 
- audio encoder ๊ตฌํ˜„
- ํšŒ์˜๊ฐ€ ์‹œ์ž‘๋  ๋•Œ(์›น์†Œ์ผ“์ด ์—ฐ๊ฒฐ๋  ๋•Œ), meeting entity์— ํšŒ์˜ ์‹œ์ž‘ ์‹œ๊ฐ„ init ํ•˜๋„๋ก ๊ตฌํ˜„
- ํšŒ์˜๊ฐ€ ์ข…๋ฃŒ๋˜๋ฉด(์›น์†Œ์ผ“ ์—ฐ๊ฒฐ์ด ๋Š๊ธฐ๋ฉด) ์˜ค๋””์˜ค ํŒŒ์ผ์„ s3์— ์—…๋กœ๋“œํ•˜๊ณ , ํ•ด๋‹น key name์„ meeting entity์— ์—…๋ฐ์ดํŠธํ•˜๊ณ  db์— ์ €์žฅํ•˜๋„๋ก ๊ตฌํ˜„
@hknhj
feat/#222: ์›น์†Œ์ผ“ ์—ฐ๊ฒฐ ์ข…๋ฃŒ ํ›„ meeting command service์—์„œ ๋กœ์ง ์ฒ˜๋ฆฌํ•˜๋„๋ก ์ˆ˜์ •
e96927a 
- web socket session์„ ์ „์—ญ์ ์œผ๋กœ ์ ‘๊ทผํ•˜๊ธฐ ์œ„ํ•ด์„œ WebSocketSessionRegistry๋ฅผ ์Šคํ”„๋ง ๋นˆ์œผ๋กœ ๋“ฑ๋ก
- ํด๋ผ์ด์–ธํŠธ์™€ ์›น์†Œ์ผ“์ด ์—ฐ๊ฒฐ๋˜๋ฉด WebSocketSessionRegistry์— meetingId๋ฅผ key๋กœ ํ•˜์—ฌ session ์ถ”๊ฐ€
- ํด๋ผ์ด์–ธํŠธ์™€ ์›น์†Œ์ผ“ ์—ฐ๊ฒฐํ•ด์ œ ์‹œ, ์Œ์„ฑ ํŒŒ์ผ s3 ์—…๋กœ๋“œ, AI ํšŒ์˜๋ก ์ƒ์„ฑ์„ meetingCommandService์˜ processAfterMeeting์—์„œ ๋น„๋™๊ธฐ๋กœ ์ฒ˜๋ฆฌํ•˜๋„๋ก ์ˆ˜์ •
- ํšŒ์˜ ์ข…๋ฃŒ API๋ฅผ ๊ตฌํ˜„ํ•˜์—ฌ, meetingId๋ฅผ ํ† ๋Œ€๋กœ ํ•ด๋‹น session์„ closeํ•˜๊ณ , WebSocketSessionRegistry์—์„œ ์‚ญ์ œํ•˜๋„๋ก ๊ตฌํ˜„
@hknhj
feat/#222: meeting start time, key name ์—…๋ฐ์ดํŠธ ์•ˆ๋˜๋Š” ์˜ค๋ฅ˜ ์ˆ˜์ •
91f6336
@hknhj
feat/#222: audio encoder ์˜์กด์„ฑ ๊ด„ํ˜ธ ์ œ๊ฑฐ
2479ba0
@hknhj
Merge pull request #225 from HaRu-Developers/feat/#222-add-meeting-stโ€ฆ
6ffe614 
โ€ฆart-time-and-voice-file-key-column

feat/#222: ํšŒ์˜ ์ข…๋ฃŒ ํ›„ s3์— ํšŒ์˜ ์Œ์„ฑ ํŒŒ์ผ ์—…๋กœ๋“œ ๊ธฐ๋Šฅ ๊ตฌํ˜„
@Jinho622
feat/#194: UserDocumentLastOpened ์—”ํ‹ฐํ‹ฐ์— thumbnailKeyName์ถ”๊ฐ€ ๋ฐ SNS ์ด๋ฒคํŠธ ์ƒโ€ฆ
cac5dbb 
โ€ฆ์„ฑ ์‹œ ์ƒ์„ฑ๋œ thubnailKeyName์ด ์ƒ์„ฑ๋ผ์žˆ๋Š” UserDocumentLastOpened์— ์ถ”๊ฐ€๋˜๋„๋ก ๊ตฌํ˜„
@Jinho622
fix/#194: SnsEvent ์—”ํ‹ฐํ‹ฐ์˜ updateKeyNameParticipantPdf ๋ฉ”์†Œ๋“œ์˜ ํŒŒ๋ผ๋ฏธํ„ฐ ์˜คํƒ€ ์ˆ˜์ •
2def47c
@Jinho622
Merge branch 'dev' into feat/#194-sns-event-list-upload-to-s3
bdd16a5
@Jinho622
Merge pull request #224 from HaRu-Developers/feat/#194-sns-event-listโ€ฆ
b357f01 
โ€ฆ-upload-to-s3

feat/#194: SNS ์ด๋ฒคํŠธ ์ฐธ์—ฌ์ž, ๋‹น์ฒจ์ž ๋ฆฌ์ŠคํŠธ ํŒŒ์ผ, ์ธ๋„ค์ผ ์ด๋ฏธ์ง€ S3์— ์—…๋กœ๋“œํ•˜๋Š” ๊ธฐ๋Šฅ ๋ฐ ๋ฆฌ์ŠคํŠธ ํŒŒ์ผ ๋‹ค์šด๋กœ๋“œ ๊ธฐ๋Šฅ ๊ตฌํ˜„ ๋ฐฉ์‹ ์ˆ˜์ •
@hknhj
fix/#226: ๋ฌธ์„œ ์ƒ์„ฑ ์‹œ, ํ•ด๋‹น ์›Œํฌ์ŠคํŽ˜์ด์Šค์— ์†ํ•ด์žˆ๋Š” ๋ชจ๋“  ์œ ์ €๋ฅผ last opened ํ…Œ์ด๋ธ”์— ๋งˆ์ง€๋ง‰์œผ๋กœ ์—ฐ ์‹œ๊ฐ„โ€ฆ
7c7551b 
โ€ฆ์„ null๋กœ ํ•˜์—ฌ ์ €์žฅํ•˜๋„๋ก ๊ตฌํ˜„

- meeting, sns event, mood tracker ์—”ํ‹ฐํ‹ฐ๋ฅผ Documentable ์ธํ„ฐํŽ˜์ด์Šค๋ฅผ implement ํ•˜๋„๋ก ํ•˜์—ฌ ์ถ”์ƒํ™”์‹œํ‚ด
@hknhj
fix/#226: ๋ฌธ์„œ ์‚ญ์ œ, ์ˆ˜์ • ์‹œ ํ•ด๋‹น ๋ฌธ์„œ id๋ฅผ ๊ฐ€์ง€๊ณ  ์žˆ๋Š” ๋ชจ๋“  last opened entity์— ๋Œ€ํ•ด ์‚ญ์ œ ๋ฐโ€ฆ
58195cf 
โ€ฆ ์ˆ˜์ • ์ด๋ฃจ์–ด์ง€๋„๋ก ์ˆ˜์ •
@hknhj
fix/#226: dev ์ถฉ๋Œ ํ•ด๊ฒฐ
7e271f0
@hknhj
Merge remote-tracking branch 'refs/remotes/origin/dev' into fix/#226-โ€ฆ
01ab128 
โ€ฆadd-all-users-in-workspace-to-last-opened

# Conflicts:
#	src/main/java/com/haru/api/domain/snsEvent/entity/SnsEvent.java
#	src/main/java/com/haru/api/domain/snsEvent/service/SnsEventCommandServiceImpl.java
@hknhj
fix/#226: meeting, sns event, mood tracker์— thumbnailKeyName ์†์„ฑ ์ถ”๊ฐ€
85da589 
- last opened entity์— thumbnailKeyName ์†์„ฑ ์ถ”๊ฐ€
- Documentable ์ธํ„ฐํŽ˜์ด์Šค์— getThumbNailKeyName() ๋ฉ”์„œ๋“œ ์ถ”๊ฐ€
@hknhj
fix/#226: ์ฟผ๋ฆฌ ๋ฉ”์„œ๋“œ ์˜ค๋ฅ˜ ์ˆ˜์ •
501c516
@hknhj
fix/#226: sns event last opened ์ˆ˜์ •, ์‚ญ์ œ ๋กœ์ง ์˜ค๋ฅ˜ ํ•ด๊ฒฐ
d886050 
- ๋ฌธ์„œ ์ˆ˜์ •, ์‚ญ์ œ ์‹œ documentId๋กœ๋งŒ ์กฐํšŒ -> documentId, documentType์œผ๋กœ ์กฐํšŒํ•˜๋„๋ก ์ˆ˜์ •
@hknhj
Merge pull request #228 from HaRu-Developers/fix/#226-add-all-users-iโ€ฆ
8e913a8 
โ€ฆn-workspace-to-last-opened

fix/#226: ๋ฌธ์„œ ์ˆ˜์ •, ์‚ญ์ œ ์‹œ last opened ์—…๋ฐ์ดํŠธ ๋กœ์ง ์ˆ˜์ •
@hknhj
feat/#130: ๋ฉ”์ธํŽ˜์ด์ง€ ์ตœ๊ทผ ๋ฌธ์„œ ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„
4df996c
@2ghrms
Merge pull request #188 from HaRu-Developers/deploy/#185-fast-api-docโ€ฆ
4f52fe8 
โ€ฆker-compose

deploy/#185: Fast API ๋ฐฐํฌ ์œ„ํ•ด network ์„ค์ •
@hknhj
Merge pull request #229 from HaRu-Developers/feat/#130-main-page-receโ€ฆ
fc5cda5 
โ€ฆnt-document-implement

feat/#130: ๋ฉ”์ธํŽ˜์ด์ง€ ์ตœ๊ทผ ๋ฌธ์„œ ์กฐํšŒ ๊ธฐ๋Šฅ ๊ตฌํ˜„
@hknhj
fix/#230: ์›Œํฌ์ŠคํŽ˜์ด์Šค ์ดˆ๋Œ€ ํ›„ ๋ฆฌ๋””๋ ‰์…˜ url ์ˆ˜์ •
048c304
@hknhj
Merge pull request #232 from HaRu-Developers/fix/#230-modify-redirectโ€ฆ
6bad90e 
โ€ฆion-url

fix/#230: ์›Œํฌ์ŠคํŽ˜์ด์Šค ์ดˆ๋Œ€ ํ›„ ๋ฆฌ๋””๋ ‰์…˜ url ์ˆ˜์ •
@hknhj hknhj merged commit 77f08f1 into main Aug 14, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@hknhj @2ghrms @Jinho622