Skip to content

Commit fa2b7ab

Browse files
goodjunseongoodjunseon
committed
Merge branch 'main' of github.com:9ITHON/7--ToGetHer
2 parents ca2ae89 + 86d8486 commit fa2b7ab

35 files changed

+62
-67
lines changed

โ€Žbackend/src/main/java/com/together/backend/domain/calendar/controller/CalendarController.javaโ€Ž

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.together.backend.domain.calendar.controller;
22

3-
import com.together.backend.domain.calendar.dto.CalendarDetailResponse;
4-
import com.together.backend.domain.calendar.dto.CalendarRecordRequest;
5-
import com.together.backend.domain.calendar.dto.CalendarRecordResponse;
6-
import com.together.backend.domain.calendar.dto.CalendarSummaryResponse;
3+
import com.together.backend.domain.calendar.model.response.CalendarDetailResponse;
4+
import com.together.backend.domain.calendar.model.request.CalendarRecordRequest;
5+
import com.together.backend.domain.calendar.model.response.CalendarRecordResponse;
6+
import com.together.backend.domain.calendar.model.response.CalendarSummaryResponse;
77
import com.together.backend.domain.calendar.service.CalendarService;
88
import com.together.backend.global.common.BaseResponse;
99
import com.together.backend.global.common.BaseResponseStatus;

โ€Žbackend/src/main/java/com/together/backend/domain/calendar/model/entity/IntakeRecord.javaโ€Ž

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33

44
import java.time.LocalDate;
5-
import java.time.LocalTime;
65
import java.util.List;
76

8-
import com.together.backend.domain.pill.model.UserPill;
7+
import com.together.backend.domain.pill.model.entity.UserPill;
98
import jakarta.persistence.*;
109
import lombok.*;
1110

โ€Žbackend/src/main/java/com/together/backend/domain/calendar/dto/CalendarRecordRequest.javaโ€Ž renamed to โ€Žbackend/src/main/java/com/together/backend/domain/calendar/model/request/CalendarRecordRequest.javaโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.together.backend.domain.calendar.dto;
1+
package com.together.backend.domain.calendar.model.request;
22

33
import com.together.backend.domain.calendar.model.entity.CondomUsage;
44
import com.together.backend.domain.calendar.model.entity.MoodType;

โ€Žbackend/src/main/java/com/together/backend/domain/calendar/dto/CalendarDetailResponse.javaโ€Ž renamed to โ€Žbackend/src/main/java/com/together/backend/domain/calendar/model/response/CalendarDetailResponse.javaโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.together.backend.domain.calendar.dto;
1+
package com.together.backend.domain.calendar.model.response;
22

33
import com.together.backend.domain.calendar.model.entity.CondomUsage;
44
import com.together.backend.domain.calendar.model.entity.MoodType;

โ€Žbackend/src/main/java/com/together/backend/domain/calendar/dto/CalendarRecordResponse.javaโ€Ž renamed to โ€Žbackend/src/main/java/com/together/backend/domain/calendar/model/response/CalendarRecordResponse.javaโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.together.backend.domain.calendar.dto;
1+
package com.together.backend.domain.calendar.model.response;
22

33
import com.together.backend.domain.calendar.model.entity.CondomUsage;
44
import com.together.backend.domain.calendar.model.entity.MoodType;

โ€Žbackend/src/main/java/com/together/backend/domain/calendar/dto/CalendarSummaryResponse.javaโ€Ž renamed to โ€Žbackend/src/main/java/com/together/backend/domain/calendar/model/response/CalendarSummaryResponse.javaโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.together.backend.domain.calendar.dto;
1+
package com.together.backend.domain.calendar.model.response;
22

33
import com.together.backend.domain.calendar.model.entity.MoodType;
44
import lombok.*;

โ€Žbackend/src/main/java/com/together/backend/domain/calendar/repository/IntakeRecordRepository.javaโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.together.backend.domain.calendar.repository;
22

33
import com.together.backend.domain.calendar.model.entity.IntakeRecord;
4-
import com.together.backend.domain.pill.model.UserPill;
4+
import com.together.backend.domain.pill.model.entity.UserPill;
55
import org.springframework.data.jpa.repository.JpaRepository;
66

77
import java.time.LocalDate;

โ€Žbackend/src/main/java/com/together/backend/domain/calendar/service/CalendarService.javaโ€Ž

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.together.backend.domain.calendar.service;
22

3-
import com.together.backend.domain.calendar.dto.CalendarDetailResponse;
4-
import com.together.backend.domain.calendar.dto.CalendarRecordRequest;
5-
import com.together.backend.domain.calendar.dto.CalendarSummaryResponse;
3+
import com.together.backend.domain.calendar.model.response.CalendarDetailResponse;
4+
import com.together.backend.domain.calendar.model.request.CalendarRecordRequest;
5+
import com.together.backend.domain.calendar.model.response.CalendarSummaryResponse;
66
import com.together.backend.domain.calendar.model.entity.BasicRecord;
77
import com.together.backend.domain.calendar.model.entity.CondomUsage;
88
import com.together.backend.domain.calendar.model.entity.IntakeRecord;
@@ -14,7 +14,7 @@
1414
import com.together.backend.domain.couple.repository.CoupleRepository;
1515
import com.together.backend.domain.notification.model.NotificationType;
1616
import com.together.backend.domain.notification.service.NotificationService;
17-
import com.together.backend.domain.pill.model.UserPill;
17+
import com.together.backend.domain.pill.model.entity.UserPill;
1818
import com.together.backend.domain.pill.repository.UserPillRepository;
1919
import com.together.backend.domain.user.model.entity.Role;
2020
import com.together.backend.domain.user.model.entity.User;

โ€Žbackend/src/main/java/com/together/backend/domain/calendar/service/IntakeRecordInitService.javaโ€Ž

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
import com.together.backend.domain.calendar.model.entity.IntakeRecord;
44
import com.together.backend.domain.calendar.model.entity.IntakeType;
55
import com.together.backend.domain.calendar.repository.IntakeRecordRepository;
6-
import com.together.backend.domain.pill.model.IntakeOption;
7-
import com.together.backend.domain.pill.model.UserPill;
6+
import com.together.backend.domain.pill.model.entity.IntakeOption;
7+
import com.together.backend.domain.pill.model.entity.UserPill;
88
import lombok.RequiredArgsConstructor;
99
import org.springframework.stereotype.Service;
1010

1111
import java.time.LocalDate;
12-
import java.time.LocalTime;
1312

1413
@Service
1514
@RequiredArgsConstructor

โ€Žbackend/src/main/java/com/together/backend/domain/couple/service/CoupleService.javaโ€Ž

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package com.together.backend.domain.couple.service;
22

33
import com.together.backend.domain.couple.model.entity.Couple;
4-
import com.together.backend.domain.couple.model.entity.CoupleStatus;
54
import com.together.backend.domain.couple.model.response.ConnectResponse;
65
import com.together.backend.domain.couple.model.response.CoupleResponse;
76
import com.together.backend.domain.couple.repository.CoupleRepository;
8-
import com.together.backend.domain.sharing.model.Sharing;
7+
import com.together.backend.domain.sharing.model.entity.Sharing;
98
import com.together.backend.domain.sharing.repository.SharingRepository;
109
import com.together.backend.domain.user.model.entity.User;
1110
import com.together.backend.domain.user.repository.UserRepository;

0 commit comments

Comments
ย (0)