Skip to content

[EA3-68] chore: develop → main 브랜치 머지 #295

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

Merged
merged 2 commits into from
Jul 29, 2025
Merged

[EA3-68] chore: develop → main 브랜치 머지 #295

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36a6bf0
[EA3-207] fix: sql 알림 타입 수정
pia01190 Jul 29, 2025
d844cb2
Merge pull request #294 from prgrms-web-devcourse-final-project/refac…
hyeunS-P Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/resources/data.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,14 @@ INSERT INTO time_vote_stat (period_id, time_slot, vote_count, activated) VALUES

-- [ alarm ]
-- 1. 스터디 초대 알림
INSERT INTO alarm (receiver_user_id, alarm_type, domain_type, domain_id, message, checked, activated) VALUES (101, 'INVITE', 'STUDY', 55, '[알고리즘 마스터즈 스터디] 에서 당신을 초대하고 싶어합니다.', false, TRUE);
INSERT INTO alarm (receiver_user_id, alarm_type, domain_type, domain_id, message, checked, activated) VALUES (101, 'STUDY_INVITE', 'STUDY', 55, '[알고리즘 마스터즈 스터디] 에서 당신을 초대하고 싶어합니다.', false, TRUE);

-- 2. 모임 일정 투표 요청 알림
INSERT INTO alarm (receiver_user_id, alarm_type, domain_type, domain_id, message, checked, activated) VALUES (8, 'TIME_VOTE_REQUEST', 'TIME_VOTE', 6, '[mock) wibby 프로젝트] 스터디장이 모임 일정 조율을 위한 투표를 요청했습니다.', false, TRUE);
INSERT INTO alarm (receiver_user_id, alarm_type, domain_type, domain_id, message, checked, activated) VALUES (9, 'TIME_VOTE_REQUEST', 'TIME_VOTE', 6, '[mock) wibby 프로젝트] 스터디장이 모임 일정 조율을 위한 투표를 요청했습니다.', false, TRUE);

-- 3. 이미 확인된 알림
INSERT INTO alarm (receiver_user_id, alarm_type, domain_type, domain_id, message, checked, activated) VALUES (103, 'INVITE', 'STUDY', 22, '[네트워크 기초반] 스터디에서 당신을 초대하고 싶어합니다.', true, TRUE);
INSERT INTO alarm (receiver_user_id, alarm_type, domain_type, domain_id, message, checked, activated) VALUES (103, 'STUDY_INVITE', 'STUDY', 22, '[네트워크 기초반] 스터디에서 당신을 초대하고 싶어합니다.', true, TRUE);

-- [ quiz ]
INSERT INTO quiz (post_id, quiz_content, quiz_answer, activated) VALUES (1, 'Java에서 List는 인터페이스다.', TRUE, TRUE);
Expand Down