Skip to content

Commit da21202

Browse files
authored
feat: 제휴지도 250710요청사항 (#207)
* feat: 개별제휴 조회 API 삭제 * feat: slack 알림 local에서도 나가는 문제 수정 * feat: 학과기입여부 API 삭제 * feat: 유저 학과조회 API에 학과가 없으면 빈문자열 return하게끔 수정 * feat: [gemini] - 슬랙 알림 에러 메시지 생성 로직 개선 * feat: [gemini] - 학과 조회 삼항연산자로 로직 개선
1 parent 66fa2df commit da21202

File tree

6 files changed

+4
-56
lines changed

6 files changed

+4
-56
lines changed

src/main/java/ssu/eatssu/domain/partnership/presentation/PartnershipController.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.springframework.web.bind.annotation.RestController;
1717
import ssu.eatssu.domain.auth.security.CustomUserDetails;
1818
import ssu.eatssu.domain.partnership.dto.CreatePartnershipRequest;
19-
import ssu.eatssu.domain.partnership.dto.PartnershipDetailResponse;
2019
import ssu.eatssu.domain.partnership.dto.PartnershipResponse;
2120
import ssu.eatssu.domain.partnership.service.PartnershipService;
2221
import ssu.eatssu.global.handler.response.BaseResponse;
@@ -53,19 +52,6 @@ public BaseResponse<List<PartnershipResponse>> getAllPartnerships(@Authenticatio
5352
return BaseResponse.success(partnershipService.getAllPartnerships(userDetails));
5453
}
5554

56-
@Operation(summary = "개별 제휴 조회", description = "개별 제휴를 조회하는 API 입니다.")
57-
@ApiResponses(value = {
58-
@ApiResponse(responseCode = "200", description = "제휴 조회 성공"),
59-
@ApiResponse(responseCode = "404", description = "존재하지 않는 제휴", content = @Content(schema =
60-
@Schema(implementation = BaseResponse.class))),
61-
@ApiResponse(responseCode = "404", description = "존재하지 않는 유저", content = @Content(schema = @Schema(implementation = BaseResponse.class))),
62-
})
63-
@GetMapping("/{partnershipId}")
64-
public BaseResponse<PartnershipDetailResponse> getPartnership(
65-
@PathVariable Long partnershipId,
66-
@AuthenticationPrincipal CustomUserDetails userDetails) {
67-
return BaseResponse.success(partnershipService.getPartnership(partnershipId, userDetails));
68-
}
6955

7056
@Operation(summary = "제휴 찜 등록하기/취소하기", description = "제휴 찜 등록하기/취소하기(토글) API 입니다.")
7157
@ApiResponses(value = {

src/main/java/ssu/eatssu/domain/partnership/service/PartnershipService.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import org.springframework.transaction.annotation.Transactional;
66
import ssu.eatssu.domain.auth.security.CustomUserDetails;
77
import ssu.eatssu.domain.partnership.dto.CreatePartnershipRequest;
8-
import ssu.eatssu.domain.partnership.dto.PartnershipDetailResponse;
98
import ssu.eatssu.domain.partnership.dto.PartnershipResponse;
109
import ssu.eatssu.domain.partnership.entity.Partnership;
1110
import ssu.eatssu.domain.partnership.entity.PartnershipLike;
@@ -66,22 +65,6 @@ public List<PartnershipResponse> getAllPartnerships(CustomUserDetails customUser
6665
}
6766

6867

69-
public PartnershipDetailResponse getPartnership(Long partnershipId, CustomUserDetails userDetails) {
70-
Partnership partnership = partnershipRepository.findById(partnershipId)
71-
.orElseThrow(() -> new BaseException(NOT_FOUND_PARTNERSHIP));
72-
PartnershipRestaurant partnershipRestaurant = partnership.getPartnershipRestaurant();
73-
74-
boolean likedByUser = false;
75-
if (userDetails != null) {
76-
User user = userRepository.findById(userDetails.getId())
77-
.orElseThrow(() -> new BaseException(NOT_FOUND_USER));
78-
likedByUser = partnershipLikeRepository.findByUserAndPartnershipRestaurant(user, partnershipRestaurant)
79-
.isPresent();
80-
}
81-
82-
return PartnershipDetailResponse.fromEntity(partnershipRestaurant, partnership, likedByUser);
83-
}
84-
8568
@Transactional
8669
public void togglePartnershipLike(Long partnershipId, CustomUserDetails userDetails) {
8770
Partnership partnership = partnershipRepository.findById(partnershipId)

src/main/java/ssu/eatssu/domain/slack/service/SlackErrorNotifier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public SlackErrorNotifier(SlackService slackService) {
1919
}
2020

2121
public void notify(BaseException ex) {
22-
if ("prod".equals(serverEnv)) {
22+
if (!"prod".equals(serverEnv)) {
2323
return;
2424
}
2525
try {

src/main/java/ssu/eatssu/domain/user/presentation/UserController.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -167,17 +167,6 @@ public BaseResponse<List<PartnershipResponse>> getUserDepartmentPartnerships(
167167
return BaseResponse.success(partnershipService.getUserDepartmentPartnerships(userDetails));
168168
}
169169

170-
@Operation(summary = "학과 기입 여부 체크", description = """
171-
학과 기입 여부 체크 API 입니다.<br><br>
172-
학과를 기입했으면 true, 아니면 false 를 반환합니다
173-
""")
174-
@ApiResponses(value = {
175-
@ApiResponse(responseCode = "200", description = "학과 기입함")
176-
})
177-
@GetMapping("/validate/department")
178-
public BaseResponse<Boolean> validateDepartmentExists(@AuthenticationPrincipal CustomUserDetails userDetails) {
179-
return BaseResponse.success(userService.validateDepartmentExists(userDetails));
180-
}
181170

182171
@Operation(summary = "유저의 학과 조회", description = "유저의 학과를 조회하는 API 입니다.")
183172
@ApiResponses(value = {

src/main/java/ssu/eatssu/domain/user/service/UserService.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.UUID;
2424

2525
import static ssu.eatssu.global.handler.response.BaseResponseStatus.DUPLICATE_NICKNAME;
26-
import static ssu.eatssu.global.handler.response.BaseResponseStatus.MISSING_USER_DEPARTMENT;
2726
import static ssu.eatssu.global.handler.response.BaseResponseStatus.NOT_FOUND_DEPARTMENT;
2827
import static ssu.eatssu.global.handler.response.BaseResponseStatus.NOT_FOUND_USER;
2928

@@ -105,20 +104,11 @@ public void registerDepartment(UpdateDepartmentRequest request, CustomUserDetail
105104
user.updateDepartment(department);
106105
}
107106

108-
public Boolean validateDepartmentExists(CustomUserDetails userDetails) {
109-
User user = userRepository.findById(userDetails.getId())
110-
.orElseThrow(() -> new BaseException(NOT_FOUND_USER));
111-
return user.getDepartment() != null;
112-
}
113-
114107
public DepartmentResponse getDepartment(CustomUserDetails userDetails) {
115108
User user = userRepository.findById(userDetails.getId())
116109
.orElseThrow(() -> new BaseException(NOT_FOUND_USER));
117110
Department department = user.getDepartment();
118-
if (department == null) {
119-
throw new BaseException(MISSING_USER_DEPARTMENT);
120-
}
121-
return new DepartmentResponse(department.getName());
111+
return new DepartmentResponse(department != null ? department.getName() : "");
122112
}
123113

124114
private boolean isForbiddenNickname(String nickname) {

src/main/resources/application-local.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ spring:
2929
jwt:
3030
secret:
3131
key: ${EATSSU_JWT_SECRET_LOCAL}
32-
token-validity-in-seconds: 10
33-
refresh-token-validity-in-seconds: 30
32+
token-validity-in-seconds: 86400
33+
refresh-token-validity-in-seconds: 604800
3434

3535
cloud:
3636
aws:

0 commit comments

Comments
 (0)