Skip to content

Commit 95de6ca

Browse files
endorsement0912endorsement0912
authored
Merge pull request #264 from prgrms-web-devcourse-final-project/develop
[EA3-68] chore: develop → main 브랜치 머지
2 parents 05c3551 + 0c748d4 commit 95de6ca

File tree

60 files changed

+908
-627
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+908
-627
lines changed

‎src/main/java/grep/neogulcoder/domain/alram/service/AlarmService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public void acceptInvite(Long targetUserId, Long alarmId) {
118118
Alarm alarm = findValidAlarm(alarmId);
119119
Long studyId = alarm.getDomainId();
120120
Study study = findValidStudy(studyId);
121-
StudyMember.createMember(study, targetUserId);
121+
studyMemberRepository.save(StudyMember.createMember(study, targetUserId));
122122
alarm.checkAlarm();
123123
}
124124

‎src/main/java/grep/neogulcoder/domain/calender/controller/PersonalCalendarController.java‎ renamed to ‎src/main/java/grep/neogulcoder/domain/calendar/controller/PersonalCalendarController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package grep.neogulcoder.domain.calender.controller;
1+
package grep.neogulcoder.domain.calendar.controller;
22

3-
import grep.neogulcoder.domain.calender.controller.dto.requset.PersonalCalendarRequest;
4-
import grep.neogulcoder.domain.calender.controller.dto.response.PersonalCalendarResponse;
5-
import grep.neogulcoder.domain.calender.service.PersonalCalendarService;
3+
import grep.neogulcoder.domain.calendar.controller.dto.requset.PersonalCalendarRequest;
4+
import grep.neogulcoder.domain.calendar.controller.dto.response.PersonalCalendarResponse;
5+
import grep.neogulcoder.domain.calendar.service.PersonalCalendarService;
66
import grep.neogulcoder.global.response.ApiResponse;
77

88
import jakarta.validation.Valid;

‎src/main/java/grep/neogulcoder/domain/calender/controller/PersonalCalendarSpecification.java‎ renamed to ‎src/main/java/grep/neogulcoder/domain/calendar/controller/PersonalCalendarSpecification.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package grep.neogulcoder.domain.calender.controller;
1+
package grep.neogulcoder.domain.calendar.controller;
22

3-
import grep.neogulcoder.domain.calender.controller.dto.requset.PersonalCalendarRequest;
4-
import grep.neogulcoder.domain.calender.controller.dto.response.PersonalCalendarResponse;
3+
import grep.neogulcoder.domain.calendar.controller.dto.requset.PersonalCalendarRequest;
4+
import grep.neogulcoder.domain.calendar.controller.dto.response.PersonalCalendarResponse;
55
import grep.neogulcoder.global.response.ApiResponse;
66
import io.swagger.v3.oas.annotations.Operation;
77
import io.swagger.v3.oas.annotations.Parameter;

‎src/main/java/grep/neogulcoder/domain/calender/controller/TeamCalendarController.java‎ renamed to ‎src/main/java/grep/neogulcoder/domain/calendar/controller/TeamCalendarController.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package grep.neogulcoder.domain.calender.controller;
1+
package grep.neogulcoder.domain.calendar.controller;
22

3-
import grep.neogulcoder.domain.calender.controller.dto.requset.TeamCalendarRequest;
4-
import grep.neogulcoder.domain.calender.controller.dto.response.TeamCalendarResponse;
5-
import grep.neogulcoder.domain.calender.service.TeamCalendarService;
3+
import grep.neogulcoder.domain.calendar.controller.dto.requset.TeamCalendarRequest;
4+
import grep.neogulcoder.domain.calendar.controller.dto.response.TeamCalendarResponse;
5+
import grep.neogulcoder.domain.calendar.service.TeamCalendarService;
66
import grep.neogulcoder.global.response.ApiResponse;
77

88
import jakarta.validation.Valid;

‎src/main/java/grep/neogulcoder/domain/calender/controller/TeamCalendarSpecification.java‎ renamed to ‎src/main/java/grep/neogulcoder/domain/calendar/controller/TeamCalendarSpecification.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package grep.neogulcoder.domain.calender.controller;
1+
package grep.neogulcoder.domain.calendar.controller;
22

3-
import grep.neogulcoder.domain.calender.controller.dto.requset.TeamCalendarRequest;
4-
import grep.neogulcoder.domain.calender.controller.dto.response.TeamCalendarResponse;
3+
import grep.neogulcoder.domain.calendar.controller.dto.requset.TeamCalendarRequest;
4+
import grep.neogulcoder.domain.calendar.controller.dto.response.TeamCalendarResponse;
55
import grep.neogulcoder.global.response.ApiResponse;
66
import io.swagger.v3.oas.annotations.Operation;
77
import io.swagger.v3.oas.annotations.Parameter;

‎src/main/java/grep/neogulcoder/domain/calender/controller/dto/requset/PersonalCalendarRequest.java‎ renamed to ‎src/main/java/grep/neogulcoder/domain/calendar/controller/dto/requset/PersonalCalendarRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package grep.neogulcoder.domain.calender.controller.dto.requset;
1+
package grep.neogulcoder.domain.calendar.controller.dto.requset;
22

3-
import grep.neogulcoder.domain.calender.entity.Calendar;
3+
import grep.neogulcoder.domain.calendar.entity.Calendar;
44
import io.swagger.v3.oas.annotations.media.Schema;
55
import jakarta.validation.constraints.NotBlank;
66
import jakarta.validation.constraints.NotNull;

‎src/main/java/grep/neogulcoder/domain/calender/controller/dto/requset/TeamCalendarRequest.java‎ renamed to ‎src/main/java/grep/neogulcoder/domain/calendar/controller/dto/requset/TeamCalendarRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package grep.neogulcoder.domain.calender.controller.dto.requset;
1+
package grep.neogulcoder.domain.calendar.controller.dto.requset;
22

3-
import grep.neogulcoder.domain.calender.entity.Calendar;
3+
import grep.neogulcoder.domain.calendar.entity.Calendar;
44
import io.swagger.v3.oas.annotations.media.Schema;
55
import jakarta.validation.constraints.NotBlank;
66
import jakarta.validation.constraints.NotNull;

‎src/main/java/grep/neogulcoder/domain/calender/controller/dto/response/PersonalCalendarResponse.java‎ renamed to ‎src/main/java/grep/neogulcoder/domain/calendar/controller/dto/response/PersonalCalendarResponse.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package grep.neogulcoder.domain.calender.controller.dto.response;
1+
package grep.neogulcoder.domain.calendar.controller.dto.response;
22

3-
import grep.neogulcoder.domain.calender.entity.Calendar;
4-
import grep.neogulcoder.domain.calender.entity.PersonalCalendar;
3+
import grep.neogulcoder.domain.calendar.entity.Calendar;
4+
import grep.neogulcoder.domain.calendar.entity.PersonalCalendar;
55
import grep.neogulcoder.domain.users.entity.User;
66
import io.swagger.v3.oas.annotations.media.Schema;
77

‎src/main/java/grep/neogulcoder/domain/calender/controller/dto/response/TeamCalendarResponse.java‎ renamed to ‎src/main/java/grep/neogulcoder/domain/calendar/controller/dto/response/TeamCalendarResponse.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package grep.neogulcoder.domain.calender.controller.dto.response;
1+
package grep.neogulcoder.domain.calendar.controller.dto.response;
22

3-
import grep.neogulcoder.domain.calender.entity.Calendar;
4-
import grep.neogulcoder.domain.calender.entity.TeamCalendar;
3+
import grep.neogulcoder.domain.calendar.entity.Calendar;
4+
import grep.neogulcoder.domain.calendar.entity.TeamCalendar;
55
import grep.neogulcoder.domain.users.entity.User;
66
import io.swagger.v3.oas.annotations.media.Schema;
77
import java.time.LocalDateTime;

‎src/main/java/grep/neogulcoder/domain/calender/entity/Calendar.java‎ renamed to ‎src/main/java/grep/neogulcoder/domain/calendar/entity/Calendar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package grep.neogulcoder.domain.calender.entity;
1+
package grep.neogulcoder.domain.calendar.entity;
22

33
import grep.neogulcoder.global.entity.BaseEntity;
44
import jakarta.persistence.*;

0 commit comments

Comments
 (0)