날짜 이슈 수정 후 운영 서버 배포

.github/workflows/notify-pr-author-on-review.yml

@@ -0,0 +1,70 @@
+name: Notify PR Review to Author
+
+on:
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  notify-author:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Extract Slack IDs and DM Text
+        id: extract_info
+        env:
+          MEMBER_INFO: ${{ secrets.MEMBER_INFO_MAP }}
+        run: |
+          PR_AUTHOR="${{ github.event.pull_request.user.login }}"
+          REVIEWER="${{ github.event.review.user.login }}"
+          REVIEW_STATE="${{ github.event.review.state }}"
+          PR_TITLE="${{ github.event.pull_request.title }}"
+          PR_URL="${{ github.event.pull_request.html_url }}"
+
+          # PR 작성자와 리뷰어가 같은 경우, 스킵 표시
+          if [ "$PR_AUTHOR" = "$REVIEWER" ]; then
+            echo "skip=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          echo "$MEMBER_INFO" | base64 --decode > memberMap.json
+          AUTHOR_SLACK_ID=$(jq -r --arg id "$PR_AUTHOR" '.[$id].slackId' memberMap.json)
+          REVIEWER_SLACK_ID=$(jq -r --arg id "$REVIEWER" '.[$id].slackId' memberMap.json)
+
+          if [ -z "$AUTHOR_SLACK_ID" ] || [ -z "$REVIEWER_SLACK_ID" ] || \
+            [ "$AUTHOR_SLACK_ID" = "null" ] || [ "$REVIEWER_SLACK_ID" = "null" ]; then
+            echo "skip=true" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          if [ "$REVIEW_STATE" = "approved" ]; then
+            TEXT="<@$REVIEWER_SLACK_ID>님이 \"<$PR_URL|$PR_TITLE>\" PR를 approve 하셨습니다!"
+          elif [ "$REVIEW_STATE" = "changes_requested" ]; then
+            TEXT="<@$REVIEWER_SLACK_ID>님이 \"<$PR_URL|$PR_TITLE>\"에 변경을 요청하셨습니다!"
+          else
+            TEXT="<@$REVIEWER_SLACK_ID>님이 \"<$PR_URL|$PR_TITLE>\"에 코멘트를 남기셨습니다!"
+          fi
+
+          echo "author_slack_id=$AUTHOR_SLACK_ID" >> $GITHUB_OUTPUT
+          echo "text=$TEXT" >> $GITHUB_OUTPUT
+
+      - name: Send Slack DM to PR Author
+        if: steps.extract_info.outputs.skip != 'true'
+        env:
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+          AUTHOR_SLACK_ID: ${{ steps.extract_info.outputs.author_slack_id }}
+          TEXT: ${{ steps.extract_info.outputs.text }}
+        run: |
+          RESPONSE=$(curl -s -X POST https://slack.com/api/chat.postMessage \
+            -H "Authorization: Bearer $SLACK_BOT_TOKEN" \
+            -H "Content-Type: application/json" \
+            -d '{
+              "channel": "'"$AUTHOR_SLACK_ID"'",
+              "text": "'"$TEXT"'"
+            }')
+
+          echo "Slack DM 전송 응답: $RESPONSE"
+
+          if ! echo "$RESPONSE" | jq -e '.ok' | grep -q true; then
+            echo "❌ Slack 메시지 전송 실패"
+            exit 1
+          fi

.github/workflows/notify-slack-on-pr-opened.yml

@@ -0,0 +1,40 @@
+name: Notify Slack When PR Is Opened
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+    branches:
+      - develop
+
+jobs:
+  notify-slack:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Decode memberMap.json from secret
+        run: |
+          echo "${{ secrets.MEMBER_INFO_MAP }}" | base64 --decode > memberMap.json
+      - name: Get PR author and reviewers
+        id: get_member_info
+        run: |
+          # PR 작성자 이름 추출
+          PR_AUTHOR_GITHUB_ID="${{ github.event.pull_request.user.login }}"
+          PR_AUTHOR_NAME=$(jq -r --arg id "$PR_AUTHOR_GITHUB_ID" '.[$id].name' memberMap.json)
+          echo "pr_author_name=$PR_AUTHOR_NAME" >> $GITHUB_OUTPUT
+
+          # PR 작성자 제외한 멤버들의 slackId를 멘션으로 모으기
+          MENTIONS=$(jq -r --arg author "$PR_AUTHOR_GITHUB_ID" 'to_entries | map(select(.key != $author)) | map("<@" + .value.slackId + ">") | join(" ")' memberMap.json)
+          echo "reviewers_mention=$MENTIONS" >> $GITHUB_OUTPUT
+
+      - name: Send Slack message
+        uses: slackapi/slack-github-action@v2.1.0
+        with:
+          method: chat.postMessage
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
+          payload: |
+            channel: ${{ secrets.SLACK_FRONT_CHANNEL_ID }}
+            text:  "리뷰하러 가기 > <${{ github.event.pull_request.html_url }}|go>\n- PR 타이틀: ${{ github.event.pull_request.title }}\n- PR 작성자: ${{ steps.get_member_info.outputs.pr_author_name }}\n- 리뷰어: ${{ steps.get_member_info.outputs.reviewers_mention }}"
+            unfurl_links: false
+            unfurl_media: false

app/(my)/my-page/page.tsx

@@ -1,7 +1,7 @@
 import { redirect } from 'next/navigation';
 import { getUserProfile } from '@/entities/user/api/get-user-profile';
 import Profile from '@/features/my-page/ui/profile';
-import ProfileInfo from '@/features/my-page/ui/profileinfo';
+import ProfileInfo from '@/features/my-page/ui/profile-info';
 import { getLoginUserId } from '@/shared/lib/get-login-user';
 
 export default async function MyPage() {

app/redirection/page.tsx

@@ -20,6 +20,7 @@ function RedirectionContent() {
         );
         const isGuest = searchParams.get('is-guest');
         const memberId = searchParams.get('member-id');
+        const authVendor = searchParams.get('auth-vendor');
 
         setCookie('accessToken', accessToken);
         setCookie('memberId', memberId);
@@ -31,19 +32,18 @@ function RedirectionContent() {
         if (isGuest === 'true') {
           router.push('/sign-up');
           sendGTMEvent({
-            event: 'member_join',
-            timestamp: new Date().toISOString(),
+            event: 'custom_member_join',
+            dl_timestamp: new Date().toISOString(),
             dl_member_id: hashValue(memberId),
           });
         } else {
-          // todo: login_method는 google 또는 kakao로 설정
           router.push('/');
           router.refresh();
           sendGTMEvent({
-            event_name: 'member_login',
-            timestamp: new Date().toISOString(),
+            event: 'custom_member_login',
+            dl_timestamp: new Date().toISOString(),
             dl_member_id: hashValue(memberId),
-            // dl_login_method: '',
+            dl_login_method: authVendor || '',
           });
         }
       } catch (error) {

src/entities/user/model/use-user-profile-query.ts

@@ -25,14 +25,14 @@ export const usePatchAutoMatchingMutation = () => {
     onSuccess: (_, variables) => {
       if (variables.autoMatching) {
         sendGTMEvent({
-          event_name: 'member_study_toggle_on',
-          timestamp: new Date().toISOString(),
+          event: 'custom_member_study_toggle_on',
+          dl_timestamp: new Date().toISOString(),
           dl_member_id: hashValue(String(variables.memberId)),
         });
       } else {
         sendGTMEvent({
-          event_name: 'member_study_toggle_off',
-          timestamp: new Date().toISOString(),
+          event: 'custom_member_study_toggle_off',
+          dl_timestamp: new Date().toISOString(),
           dl_member_id: hashValue(String(variables.memberId)),
         });
       }

src/features/auth/ui/sign-up-modal.tsx

@@ -107,9 +107,7 @@ export default function SignupModal({
                 handleImageChange={handleImageChange}
               />
               <div className="font-designer-24b text-text-default mt-2 text-center">
-                서비스 이용을 위해
-                <br />
-                닉네임 대신 이름을 입력해주세요.
+                서비스 이용을 위해 이름을 입력해주세요.
               </div>
               <SignupNameInput
                 name={name}

src/features/auth/ui/sign-up-name-input.tsx

@@ -24,7 +24,7 @@ export default function SignupNameInput({
       >
         {error
           ? '이름에는 숫자나 특수문자를 사용할 수 없습니다. 두 글자 이상 입력해주세요.'
-          : '닉네임이 아닌 실명을 입력해주세요. (예: 홍길동 )'}
+          : '신뢰 있는 매칭을 위해 실명을 사용해주세요. (예: 홍길동 )'}
       </div>
     </div>
   );

src/features/my-page/api/types.ts

@@ -32,7 +32,7 @@ export interface UpdateUserProfileResponse {
 export interface UpdateUserProfileInfoRequest {
   selfIntroduction: string;
   studyPlan: string;
-  preferredStudySubject: string;
+  preferredStudySubjectId: string;
   availableStudyTimeIds: number[];
   techStackIds: number[];
 }

src/features/my-page/ui/profile-edit-modal.tsx

@@ -17,14 +17,40 @@ interface Props {
   memberId: number;
 }
 
-const skillOptions = [
-  { label: 'HTML/CSS', value: 'HTML/CSS' },
-  { label: 'JavaScript', value: 'JavaScript' },
-  { label: 'React', value: 'React' },
-  { label: 'Django', value: 'Django' },
-  { label: 'MySQL', value: 'MySQL' },
+const DEFAULT_OPTIONS = [
+  { label: '운동/헬스', value: '운동/헬스' },
+  { label: '여행', value: '여행' },
+  { label: '음악', value: '음악' },
+  { label: '영화/드라마', value: '영화/드라마' },
+  { label: '독서', value: '독서' },
+  { label: '게임', value: '게임' },
+  { label: '요리/맛집 탐방', value: '요리/맛집 탐방' },
+  { label: '패션/뷰티', value: '패션/뷰티' },
+  { label: '사진/영상', value: '사진/영상' },
+  { label: '자기계발', value: '자기계발' },
 ];
 
+export const MBTI_OPTIONS = [
+  { label: 'ISTJ', value: 'ISTJ' },
+  { label: 'ISFJ', value: 'ISFJ' },
+  { label: 'INFJ', value: 'INFJ' },
+  { label: 'INTJ', value: 'INTJ' },
+  { label: 'ISTP', value: 'ISTP' },
+  { label: 'ISFP', value: 'ISFP' },
+  { label: 'INFP', value: 'INFP' },
+  { label: 'INTP', value: 'INTP' },
+  { label: 'ESTP', value: 'ESTP' },
+  { label: 'ESFP', value: 'ESFP' },
+  { label: 'ENFP', value: 'ENFP' },
+  { label: 'ENTP', value: 'ENTP' },
+  { label: 'ESTJ', value: 'ESTJ' },
+  { label: 'ESFJ', value: 'ESFJ' },
+  { label: 'ENFJ', value: 'ENFJ' },
+  { label: 'ENTJ', value: 'ENTJ' },
+];
+
+export type MbtiValue = (typeof MBTI_OPTIONS)[number]['value'];
+
 export default function ProfileEditModal({
   onSubmit,
   memberProfile,
@@ -182,17 +208,18 @@ export default function ProfileEditModal({
               />
               <FormField
                 label="MBTI"
-                type="text"
+                type="singledropdown"
                 description="자신의 성격 유형을 입력해 주세요."
                 value={mbti}
                 onChange={setMbti}
+                options={MBTI_OPTIONS}
               />
               <FormField
-                label="관심사"
-                type="multidropdown"
+                label="관심 태그"
+                type="userselect"
                 value={interests}
                 onChange={setInterests}
-                options={skillOptions}
+                options={DEFAULT_OPTIONS}
               />
               <FormField
                 label="한마디 소개"

src/features/my-page/ui/profileinfo-edit-modal.tsx → src/features/my-page/ui/profile-info-edit-modal.tsx

@@ -28,8 +28,8 @@ export default function ProfileInfoEditModal({ memberInfo, onSubmit }: Props) {
   const [studyPlan, setStudyPlan] = useState<
     UpdateUserProfileInfoRequest['studyPlan']
   >(memberInfo.studyPlan ?? '');
-  const [preferredSubject, setPreferredSubject] = useState<
-    UpdateUserProfileInfoRequest['preferredStudySubject']
+  const [preferredStudySubjectId, setPreferredStudySubjectId] = useState<
+    UpdateUserProfileInfoRequest['preferredStudySubjectId']
   >(memberInfo.preferredStudySubject?.studySubjectId ?? undefined);
   const [availableTimeSlots, setAvailableTimeSlots] = useState<
     UpdateUserProfileInfoRequest['availableStudyTimeIds']
@@ -42,7 +42,7 @@ export default function ProfileInfoEditModal({ memberInfo, onSubmit }: Props) {
     const formData: UpdateUserProfileInfoRequest = {
       selfIntroduction,
       studyPlan,
-      preferredStudySubject: preferredSubject,
+      preferredStudySubjectId: preferredStudySubjectId,
       availableStudyTimeIds: availableTimeSlots
         .filter((id) => id)
         .map((id) => Number(id)),
@@ -98,8 +98,8 @@ export default function ProfileInfoEditModal({ memberInfo, onSubmit }: Props) {
                 label="선호하는 스터디 주제"
                 type="singledropdown"
                 description="관심있는 스터디 유형을 선택해주세요."
-                value={preferredSubject}
-                onChange={setPreferredSubject}
+                value={preferredStudySubjectId}
+                onChange={setPreferredStudySubjectId}
                 direction="vertical"
                 required
                 options={
@@ -112,15 +112,17 @@ export default function ProfileInfoEditModal({ memberInfo, onSubmit }: Props) {
               <FormField
                 label="가능 시간대"
                 type="togglegroup"
-                value={availableTimeSlots}
+                value={availableTimeSlots.map(String)}
                 direction="vertical"
                 options={
                   availableStudyTimes?.map(({ availableTimeId, display }) => ({
                     value: availableTimeId.toString(),
                     label: display,
                   })) ?? []
                 }
-                onChange={setAvailableTimeSlots}
+                onChange={(availableStudyTimeIds) =>
+                  setAvailableTimeSlots(availableStudyTimeIds.map(Number))
+                }
                 required
               />
               <FormField
@@ -157,8 +159,8 @@ export default function ProfileInfoEditModal({ memberInfo, onSubmit }: Props) {
                     );
 
                     sendGTMEvent({
-                      event_name: 'member_card',
-                      timestamp: new Date().toISOString(),
+                      event: 'custom_member_card',
+                      dl_timestamp: new Date().toISOString(),
                       dl_member_id: hashValue(memberId),
                       dl_tags: selectedSkillNames,
                     });

src/features/my-page/ui/profileinfo.tsx → src/features/my-page/ui/profile-info.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { MemberInfo } from '@/entities/user/api/types';
-import ProfileInfoEditModal from '@/features/my-page/ui/profileinfo-edit-modal';
+import ProfileInfoEditModal from '@/features/my-page/ui/profile-info-edit-modal';
 import ProfileInfoCard from '@/widgets/my-page/profileinfo-card';
 import { UpdateUserProfileInfoRequest } from '../api/types';
 import { useUpdateUserProfileInfoMutation } from '../model/use-update-user-profile-mutation';

src/features/study/api/types.ts

@@ -11,7 +11,7 @@ export interface DailyStudy {
   interviewerImage: string;
   interviewee: string;
   intervieweeImage: string;
-  studySpaceId: number;
+  dailyStudyId: number;
   subject: string;
   feedback: string | undefined;
   progressStatus: StudyProgressStatus;