Merge branch 'feat#61-search-api' of https://github.com/swyp-app-team-4/boombim-backend-api into dev

Author: chltmdgh522

src/main/java/boombimapi/domain/congestion/repository/MemberCongestionRepository.java

@@ -2,9 +2,13 @@
 
 import boombimapi.domain.congestion.entity.MemberCongestion;
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 
-import feign.Param;
+import boombimapi.domain.place.entity.MemberPlace;
+import org.springframework.data.repository.query.Param;
+import org.springframework.data.domain.Pageable;
+
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -23,13 +27,17 @@ Optional<MemberCongestion> findFirstByMemberPlaceIdAndExpiresAtAfterOrderByCreat
     );
 
     @Query("""
-        SELECT COUNT(mc) 
-        FROM MemberCongestion mc
-        WHERE mc.memberPlace.id = :placeId
-          AND CAST(mc.createdAt AS DATE) = CURRENT_DATE
-        """)
+           SELECT COUNT(mc)
+           FROM MemberCongestion mc
+           WHERE mc.memberPlace.id = :placeId
+             AND CAST(mc.createdAt AS DATE) = CURRENT_DATE
+           """)
     long countTodayByPlace(@Param("placeId") Long placeId);
 
+
+    Optional<MemberCongestion> findTop1ByMemberPlaceIdOrderByCreatedAtDesc(Long placeId);
+
+
     Slice<MemberCongestion> findByMemberPlaceIdOrderByIdDesc(
         Long memberPlaceId,
         Pageable pageable

src/main/java/boombimapi/domain/congestion/repository/OfficialCongestionRepository.java

@@ -1,8 +1,15 @@
 package boombimapi.domain.congestion.repository;
 
 import boombimapi.domain.congestion.entity.OfficialCongestion;
+
+import java.util.List;
 import java.util.Optional;
+
+import boombimapi.domain.place.entity.OfficialPlace;
+import org.springframework.data.repository.query.Param;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 public interface OfficialCongestionRepository extends JpaRepository<OfficialCongestion, Long> {
 
@@ -11,4 +18,8 @@ Optional<OfficialCongestion> findTopByOfficialPlaceIdOrderByObservedAtDesc(
         Long officialPlaceId
     );
 
+
+
+
+
 }

src/main/java/boombimapi/domain/member/domain/entity/Member.java

@@ -5,6 +5,7 @@
 import boombimapi.domain.alarm.domain.entity.fcm.FcmToken;
 import boombimapi.domain.congestion.entity.MemberCongestion;
 import boombimapi.domain.oauth2.domain.entity.SocialProvider;
+import boombimapi.domain.search.domain.entity.Search;
 import boombimapi.domain.vote.domain.entity.Vote;
 import boombimapi.domain.vote.domain.entity.VoteAnswer;
 import boombimapi.domain.vote.domain.entity.VoteDuplication;
@@ -54,9 +55,14 @@ public class Member {
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<VoteAnswer> voteAnswers = new ArrayList<>();
 
+    // 7) 혼잡도 멤버들
     @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<MemberCongestion> memberCongestions = new ArrayList<>();
 
+    // 7) 혼잡도 멤버들
+    @OneToMany(mappedBy = "member", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<Search> searchs = new ArrayList<>();
+
     @Column(nullable = false)
     private String email;
 
@@ -86,12 +92,12 @@ public class Member {
     private boolean alarmFlag;
 
     // 첫 로그인일시에는 false 이후에는 계속 true
-    @Column(name= "name_flag", nullable = false)
+    @Column(name = "name_flag", nullable = false)
     private boolean nameFlag;
 
     @Builder
     public Member(String id, String email, String name, String profile,
-                SocialProvider socialProvider, Role role) {
+                  SocialProvider socialProvider, Role role) {
         this.id = id;
         this.email = email;
         this.name = name;
@@ -107,20 +113,27 @@ public void updateEmail(String email) {
     }
 
     public void updateName(String name) {
-        this.name=name;
+        this.name = name;
     }
 
-    public void updateProfile(String profile){this.profile= profile;}
+    public void updateProfile(String profile) {
+        this.profile = profile;
+    }
 
     public void updateIsActivateNameFlag() {
-        this.nameFlag=true;
+        this.nameFlag = true;
     }
 
     public void updateIsActivateAlarmFlag() {
-        this.alarmFlag=true;
+        this.alarmFlag = true;
     }
+
     public void updateIsDeactivateAlarmFlag() {
-        this.alarmFlag=false;
+        this.alarmFlag = false;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
     }
 
     @PrePersist

src/main/java/boombimapi/domain/member/presentation/controller/AdminController.java

@@ -1,7 +1,11 @@
 package boombimapi.domain.member.presentation.controller;
 
 import boombimapi.domain.member.application.service.AdminService;
+import boombimapi.domain.member.domain.entity.Member;
+import boombimapi.domain.member.domain.entity.Role;
+import boombimapi.domain.member.domain.repository.MemberRepository;
 import boombimapi.domain.member.presentation.dto.admin.req.AdminLoginReq;
+import boombimapi.domain.oauth2.domain.entity.SocialProvider;
 import boombimapi.domain.oauth2.presentation.dto.res.LoginToken;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -11,8 +15,12 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.UUID;
+
+
 @RestController
 @RequestMapping("/api/admin")
 @RequiredArgsConstructor
@@ -21,8 +29,10 @@
 public class AdminController {
 
     private final AdminService adminService;
+    private final MemberRepository memberRepository;
+    private final PasswordEncoder passwordEncoder;
 
-    @Operation(summary = "[관리자 전용] 일반 로그인", description = "이메일과 비밀번호로 관리자 로그인을 처리합니다.")
+    @Operation(summary = "관리자 일반 로그인", description = "이메일과 비밀번호로 관리자 로그인을 처리합니다.")
     @ApiResponses(value = {
             @ApiResponse(responseCode = "200", description = "로그인 성공"),
             @ApiResponse(responseCode = "401", description = "인증 실패 (이메일 또는 비밀번호 불일치)"),
@@ -33,4 +43,23 @@ public ResponseEntity<LoginToken> adminLogin(@Valid @RequestBody AdminLoginReq r
         LoginToken loginToken = adminService.postLogin(req);
         return ResponseEntity.ok(loginToken);
     }
+
+
+    @PostMapping("/join")
+    public void adminJoin(@Valid @RequestBody AdminLoginReq req) {
+        Member admin = Member.builder()
+                .id(UUID.randomUUID().toString())
+                .email(req.loginId())
+                .name("관리자") // 기본 이름
+                .profile(null)
+                .socialProvider(SocialProvider.KAKAO) // 고정
+                .role(Role.ADMIN)                     // 관리자 권한
+                .build();
+
+        // 비밀번호 encode 해서 세팅
+        admin.setPassword(passwordEncoder.encode(req.password()));
+
+        // 저장
+        memberRepository.save(admin);
+    }
 }

src/main/java/boombimapi/domain/place/repository/MemberPlaceRepository.java

@@ -3,7 +3,13 @@
 import boombimapi.domain.place.entity.MemberPlace;
 import java.util.List;
 import java.util.Optional;
+
+import boombimapi.domain.search.presentation.dto.PlaceNameProjection;
+import org.springframework.data.repository.query.Param;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 public interface MemberPlaceRepository extends JpaRepository<MemberPlace, Long> {
 
@@ -15,4 +21,21 @@ List<MemberPlace> findByLatitudeBetweenAndLongitudeBetween(
         double minLongitude,
         double maxLongitude
     );
+
+    // 연관 검색
+    @Query("""
+    select p.name as name
+    from MemberPlace p
+    where lower(p.name) like lower(concat('%', ?1, '%'))
+    order by lower(p.name) asc
+""")
+    List<PlaceNameProjection> searchByName(String keyword, Pageable pageable);
+
+
+
+    // 검색 결과
+    List<MemberPlace> findEntitiesByNameContainingIgnoreCase(String keyword, Pageable pageable);
+
+
+
 }

src/main/java/boombimapi/domain/place/repository/OfficialPlaceRepository.java

@@ -2,7 +2,12 @@
 
 import boombimapi.domain.place.entity.OfficialPlace;
 import java.util.List;
+
+import boombimapi.domain.search.presentation.dto.PlaceNameProjection;
+import org.springframework.data.repository.query.Param;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 public interface OfficialPlaceRepository extends JpaRepository<OfficialPlace, Long> {
 
@@ -14,4 +19,15 @@ List<OfficialPlace> findByCentroidLatitudeBetweenAndCentroidLongitudeBetween(
         double maxLongitude
     );
 
+    // 연관 검색
+    @Query("""
+    select o.name as name
+    from OfficialPlace o
+    where lower(o.name) like lower(concat('%', ?1, '%'))
+    order by lower(o.name) asc
+""")
+    List<PlaceNameProjection> searchByName(String keyword, Pageable pageable);
+
+    // 검색 결과
+    List<OfficialPlace> findEntitiesByNameContainingIgnoreCase(String keyword, Pageable pageable);
 }

src/main/java/boombimapi/domain/search/application/SearchService.java

@@ -0,0 +1,26 @@
+package boombimapi.domain.search.application;
+
+import boombimapi.domain.search.presentation.dto.res.SearchHistoryRes;
+import boombimapi.domain.search.presentation.dto.res.SearchRelatedRes;
+import boombimapi.domain.search.presentation.dto.res.SearchRes;
+
+import java.util.List;
+
+public interface SearchService {
+
+    // 최근 검색 내역 10개 조회
+    List<SearchHistoryRes> getSearchHistory(String userId);
+
+    // 연관 검색어 조회
+    List<SearchRelatedRes> getSearchRelated(String posName);
+
+
+    // 검색 결과 조회 및 검색 내역 저장
+    List<SearchRes> getSearch(String posName, String userId);
+
+    // 개인 삭제
+    void deletePersonal(Long searchId, String userId);
+
+    // 전체 삭제
+    void deleteAll(String userId);
+}