Skip to content

Commit ec6b3df

Browse files
committed
[test]cafeteriaServiceV2 Test code success
1 parent 9b753f1 commit ec6b3df

File tree

17 files changed

+333
-11
lines changed

17 files changed

+333
-11
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package com.example.Jinus.controller.v2;
2+
3+
import com.example.Jinus.service.userInfo.UserService;
4+
import com.example.Jinus.service.v2.cafeteria.CafeteriaServiceV2;
5+
import com.example.Jinus.service.v2.cafeteria.CampusServiceV2;
6+
import com.example.Jinus.service.v2.userInfo.UserServiceV2;
7+
import org.springframework.web.bind.annotation.RestController;
8+
9+
@RestController
10+
public class CafeteriaControllerV2 {
11+
12+
private final UserServiceV2 userServiceV2;
13+
private final CampusServiceV2 campusServiceV2;
14+
private final CafeteriaServiceV2 cafeteriaServiceV2;
15+
16+
public CafeteriaControllerV2(
17+
UserServiceV2 userServiceV2,
18+
CampusServiceV2 campusServiceV2,
19+
CafeteriaServiceV2 cafeteriaServiceV2) {
20+
this.userServiceV2 = userServiceV2;
21+
this.campusServiceV2 = campusServiceV2;
22+
this.cafeteriaServiceV2 = cafeteriaServiceV2;
23+
}
24+
25+
26+
}

src/main/java/com/example/Jinus/dto/response/ComponentDto.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public class ComponentDto {
1111
private BasicCardDto basicCard;
1212
private SimpleTextDto simpleText;
1313
private SimpleImageDto simpleImage;
14+
private ListCardDto listCard;
1415

1516
public ComponentDto(CarouselDto carousel) {
1617
this.carousel = carousel;
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.example.Jinus.dto.response;
2+
3+
import lombok.Getter;
4+
import lombok.Setter;
5+
6+
import java.util.ArrayList;
7+
8+
@Getter
9+
@Setter
10+
public class ListCardDto {
11+
private HeaderDto header;
12+
private ArrayList<ListItemDto> items;
13+
14+
public ListCardDto(HeaderDto header, ArrayList<ListItemDto> items) {
15+
this.header = header;
16+
this.items = items;
17+
}
18+
}

src/main/java/com/example/Jinus/entity/cafeteria/CafeteriaEntity.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@
44
import jakarta.persistence.Entity;
55
import jakarta.persistence.Id;
66
import jakarta.persistence.Table;
7+
import lombok.AllArgsConstructor;
78
import lombok.Getter;
9+
import lombok.NoArgsConstructor;
810
import lombok.Setter;
911

1012
@Entity
1113
@Getter
1214
@Setter
1315
@Table(name = "cafeteria")
16+
@NoArgsConstructor
17+
@AllArgsConstructor
1418
public class CafeteriaEntity {
1519
@Id
1620
@Column(name = "id")

src/main/java/com/example/Jinus/entity/cafeteria/CampusEntity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.example.Jinus.entity.cafeteria;
22

33
import jakarta.persistence.*;
4+
import lombok.AllArgsConstructor;
45
import lombok.Getter;
56
import lombok.NoArgsConstructor;
67
import lombok.Setter;
@@ -10,6 +11,7 @@
1011
@Setter
1112
@Table(name = "campus")
1213
@NoArgsConstructor
14+
@AllArgsConstructor
1315
public class CampusEntity {
1416
@Id
1517
@Column(name = "id")
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.example.Jinus.repository.v2.cafeteria;
2+
3+
import com.example.Jinus.entity.cafeteria.CafeteriaEntity;
4+
import org.springframework.data.jpa.repository.JpaRepository;
5+
import org.springframework.data.jpa.repository.Query;
6+
import org.springframework.data.repository.query.Param;
7+
8+
import java.util.HashMap;
9+
import java.util.List;
10+
11+
public interface CafeteriaRepositoryV2 extends JpaRepository<CafeteriaEntity, Integer> {
12+
// 사용자 campusId와 동일한 식당이름과 url 찾기
13+
@Query("SELECT c.cafeteriaNameKo, c.thumbnailUrl FROM CafeteriaEntity c WHERE c.campusId = :campusId")
14+
List<Object[]> findCafeteriaListByCampusId(@Param("campusId")int campusId);
15+
}

src/main/java/com/example/Jinus/repository/v2/cafeteria/CampusRepositoryV2.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22

33
import com.example.Jinus.entity.cafeteria.CampusEntity;
44
import org.springframework.data.jpa.repository.JpaRepository;
5+
import org.springframework.data.jpa.repository.Query;
6+
import org.springframework.data.repository.query.Param;
57
import org.springframework.stereotype.Repository;
68

79
@Repository
810
public interface CampusRepositoryV2 extends JpaRepository<CampusEntity, Integer> {
9-
11+
// 사용자 campusId로 캠퍼스 찾기
12+
@Query("SELECT c.campusNameKo FROM CampusEntity c WHERE c.id = :campusId")
13+
String findCampusNameById(@Param("campusId") int campusId);
1014
}

src/main/java/com/example/Jinus/repository/v2/userInfo/UserRepositoryV2.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
@Repository
1212
public interface UserRepositoryV2 extends JpaRepository<UserEntity, String> {
13-
// 사용자 등록여부 확인
13+
// 사용자 등록여부 확인(존재한다면 campusId 찾기)
1414
@Query("SELECT u.campusId FROM UserEntity u WHERE u.kakaoId = :kakaoId")
1515
Optional<Integer> findCampusIdById(@Param("kakaoId") String id);
1616
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.example.Jinus.service.v2.cafeteria;
2+
3+
import com.example.Jinus.repository.cafeteria.CafeteriaRepository;
4+
import com.example.Jinus.repository.v2.cafeteria.CafeteriaRepositoryV2;
5+
import org.springframework.stereotype.Service;
6+
7+
import java.util.List;
8+
9+
@Service
10+
public class CafeteriaServiceV2 {
11+
12+
private final CafeteriaRepositoryV2 cafeteriaRepositoryV2;
13+
14+
public CafeteriaServiceV2(CafeteriaRepositoryV2 cafeteriaRepositoryV2) {
15+
this.cafeteriaRepositoryV2 = cafeteriaRepositoryV2;
16+
}
17+
18+
// 사용자의 campusId와 동일한 식당리스트 찾기
19+
public List<Object[]> findCafeteriaList(int campusId) {
20+
return cafeteriaRepositoryV2.findCafeteriaListByCampusId(campusId);
21+
}
22+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.example.Jinus.service.v2.cafeteria;
2+
3+
import com.example.Jinus.repository.v2.cafeteria.CampusRepositoryV2;
4+
import org.springframework.beans.factory.annotation.Autowired;
5+
import org.springframework.stereotype.Service;
6+
7+
@Service
8+
public class CampusServiceV2 {
9+
private final CampusRepositoryV2 campusRepositoryV2;
10+
11+
@Autowired
12+
public CampusServiceV2(CampusRepositoryV2 campusRepositoryV2) {
13+
this.campusRepositoryV2 = campusRepositoryV2;
14+
}
15+
16+
// 사용자의 campusId 받아 캠퍼스 이름 찾기
17+
public String findUserCampusName(int campusId) {
18+
return campusRepositoryV2.findCampusNameById(campusId);
19+
}
20+
}

0 commit comments

Comments
 (0)