Skip to content

Commit 00d1409

Browse files
authored
fix: 250930 수정요청사항 (#248)
* feat: 자장밥 필터링 안되게 추가 * refactor: /v2/reviews/my swagger json 깨지는 문제 수정 * refactor: valid-for-review swagger menulist 수정 * refactor: /list/menu mainRating->rating, 맛/양 rating 필드 삭제 * chore: 코드 포맷팅 * refactor: mainRating->rating으로 필드 변경 * /list/menu에 id,name,isLike추가 * fix: gemini 리뷰 반영
1 parent 507108c commit 00d1409

24 files changed

Lines changed: 99 additions & 94 deletions

src/main/java/ssu/eatssu/domain/auth/infrastructure/SecurityConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
1515
import ssu.eatssu.domain.auth.security.JwtAuthenticationFilter;
1616
import ssu.eatssu.domain.auth.security.JwtTokenProvider;
17-
import ssu.eatssu.domain.slack.service.SlackErrorNotifier;
1817
import ssu.eatssu.global.handler.JwtAccessDeniedHandler;
1918
import ssu.eatssu.global.handler.JwtAuthenticationEntryPoint;
2019

src/main/java/ssu/eatssu/domain/auth/security/JwtAuthenticationFilter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
import org.springframework.util.StringUtils;
1616
import org.springframework.web.filter.GenericFilterBean;
1717

18-
19-
2018
import java.io.IOException;
2119
import java.util.List;
2220

src/main/java/ssu/eatssu/domain/menu/entity/Menu.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ public class Menu {
3333
private final Reviews reviews = new Reviews();
3434
@OneToMany(mappedBy = "menu", cascade = CascadeType.ALL)
3535
private final List<MealMenu> mealMenus = new ArrayList<>();
36+
@Column(name = "unlike_count")
37+
private Integer unlikeCount = 0;
3638
@Id
3739
@GeneratedValue(strategy = GenerationType.IDENTITY)
3840
@Column(name = "menu_id")
@@ -44,15 +46,10 @@ public class Menu {
4446
@ManyToOne(fetch = FetchType.LAZY)
4547
@JoinColumn(name = "menu_category_id")
4648
private MenuCategory category;
47-
4849
private boolean isDiscontinued = false;
49-
5050
@Column(name = "like_count")
5151
private Integer likeCount = 0;
5252

53-
@Column(name = "unlike_count")
54-
private final Integer unlikeCount = 0;
55-
5653
private Menu(String name, Restaurant restaurant, Integer price, MenuCategory category) {
5754
this.name = name;
5855
this.restaurant = restaurant;

src/main/java/ssu/eatssu/domain/menu/persistence/QuerydslMenuRatingCalculator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public Double getMainRatingAverage(Long menuId) {
2727
}
2828

2929

30-
3130
private BooleanExpression menuIdEq(Long menuId) {
3231
return menu.id.eq(menuId);
3332
}

src/main/java/ssu/eatssu/domain/partnership/dto/PartnershipInfo.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ public static PartnershipInfo fromEntity(Partnership partnership,
2828
.startDate(partnership.getStartDate())
2929
.endDate(partnership.getEndDate())
3030
.collegeName(partnership.getPartnershipCollege() == null && partnership.getPartnershipDepartment() == null
31-
? "총학생회"
32-
: (partnership.getPartnershipCollege() != null ? partnership.getPartnershipCollege().getName() : null))
33-
.departmentName(partnership.getPartnershipDepartment() != null ? partnership.getPartnershipDepartment().getName() : null)
31+
? "총학생회"
32+
: (partnership.getPartnershipCollege() != null ? partnership.getPartnershipCollege()
33+
.getName() : null))
34+
.departmentName(partnership.getPartnershipDepartment() != null ? partnership.getPartnershipDepartment()
35+
.getName() : null)
3436
.likeCount(restaurant.getLikes() != null ? restaurant.getLikes().size() : 0)
3537
.isLiked(isLiked)
3638
.build();

src/main/java/ssu/eatssu/domain/partnership/entity/Partnership.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
import jakarta.persistence.Column;
44
import jakarta.persistence.Entity;
5-
import jakarta.persistence.EnumType;
6-
import jakarta.persistence.Enumerated;
75
import jakarta.persistence.FetchType;
86
import jakarta.persistence.GeneratedValue;
97
import jakarta.persistence.GenerationType;
@@ -32,7 +30,7 @@ public class Partnership {
3230
@GeneratedValue(strategy = GenerationType.IDENTITY)
3331
@Column(name = "partnership_id")
3432
private Long id;
35-
33+
3634
@Column(name = "description", nullable = false)
3735
private String description;
3836

src/main/java/ssu/eatssu/domain/partnership/persistence/PartnershipRepository.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212

1313
public interface PartnershipRepository extends JpaRepository<Partnership, Long> {
1414
@Query("""
15-
select distinct pr
16-
from PartnershipRestaurant pr
17-
join fetch pr.partnerships p
18-
left join fetch p.partnershipCollege pc
19-
left join fetch p.partnershipDepartment pd
20-
where
21-
(
22-
pc = :college
23-
or pd = :department
24-
or (pc is null and pd is null)
25-
)
26-
and (p.endDate is null or p.endDate >= current_date)
27-
""")
15+
select distinct pr
16+
from PartnershipRestaurant pr
17+
join fetch pr.partnerships p
18+
left join fetch p.partnershipCollege pc
19+
left join fetch p.partnershipDepartment pd
20+
where
21+
(
22+
pc = :college
23+
or pd = :department
24+
or (pc is null and pd is null)
25+
)
26+
and (p.endDate is null or p.endDate >= current_date)
27+
""")
2828
List<PartnershipRestaurant> findRestaurantsWithMyPartnerships(
2929
@Param("college") College college,
3030
@Param("department") Department department

src/main/java/ssu/eatssu/domain/restaurant/entity/Restaurant.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public enum Restaurant {
1515
FOOD_COURT("FOOD_COURT", null),
1616
SNACK_CORNER("SNACK_CORNER", null),
1717
HAKSIK("HAKSIK", 5000),
18-
FACULTY("FACULTY",null);
18+
FACULTY("FACULTY", null);
1919

2020
private final String restaurantName;
2121
private final Integer restaurantPrice;

src/main/java/ssu/eatssu/domain/review/dto/CreateMenuReviewRequest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import lombok.Getter;
77
import lombok.NoArgsConstructor;
88
import lombok.Setter;
9-
import org.springframework.util.Assert;
109
import ssu.eatssu.domain.menu.entity.Menu;
1110
import ssu.eatssu.domain.rating.entity.Ratings;
1211
import ssu.eatssu.domain.review.entity.Review;

src/main/java/ssu/eatssu/domain/review/dto/MealReviewResponse.java

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,20 @@ public class MealReviewResponse {
4242
@Schema(description = "리뷰 이미지 url 리스트", example = "[\"imgurl1\", \"imgurl2\"]")
4343
private List<String> imageUrls;
4444

45-
@Schema(description = "메뉴 리스트")
45+
@Schema(description = "메뉴 리스트", example = """
46+
[
47+
{
48+
"menuId": 3143,
49+
"name": "생고기제육볶음",
50+
"isLike": true
51+
},
52+
{
53+
"menuId": 3144,
54+
"name": "오징어초무침",
55+
"isLike": false
56+
}
57+
]
58+
""")
4659
private List<MenuIdNameLikeDto> menuList;
4760

4861
public static MealReviewResponse from(Review review,

0 commit comments

Comments
 (0)