[#61] 최근 방문한 매장 조회 기능 구현

src/main/java/com/delfood/config/RedisConfig.java

@@ -18,7 +18,6 @@
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
-@Configuration
 public class RedisConfig {
   @Value("${spring.redis.host}")
   private String redisHost;

src/main/java/com/delfood/config/ShopRedisConfig.java

@@ -0,0 +1,24 @@
+package com.delfood.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericToStringSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+public class ShopRedisConfig {
+
+    @Bean
+    public LettuceConnectionFactory shopRedisConnectionFactory() { return new LettuceConnectionFactory(); }
+
+    @Bean
+    public RedisTemplate<String, Long> shopRedisTemplate() {
+        RedisTemplate<String, Long> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(shopRedisConnectionFactory());
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setValueSerializer(new GenericToStringSerializer<>(Long.class));
+        return  redisTemplate;
+    }
+}

src/main/java/com/delfood/controller/MenuGroupController.java

@@ -2,9 +2,11 @@
 
 import com.delfood.aop.OwnerLoginCheck;
 import com.delfood.aop.OwnerShopCheck;
+import com.delfood.dao.RecentShopViewDao;
 import com.delfood.dto.MenuGroupDTO;
 import com.delfood.dto.ShopDTO;
 import com.delfood.service.MenuGroupService;
+import com.delfood.service.RecentShopViewService;
 import com.delfood.service.ShopService;
 import com.delfood.utils.SessionUtil;
 
@@ -33,7 +35,10 @@ public class MenuGroupController {
 
   @Autowired
   MenuGroupService menuGroupService;
-
+
+  @Autowired
+  RecentShopViewService recentShopViewService;
+
   /**
    * 메뉴 관리
    * - 매장 목록을 보여준다.
@@ -56,18 +61,22 @@ public ResponseEntity<List<ShopDTO>> shops(HttpSession session,
 
   /**
    * 매장 이름, 주소 및 모든 메뉴 정보를 조회한다.
-   * 메뉴 그룹 > 메뉴 > 상위 옵션 2개
-   * 
+   *
    * @author jinyoung
    * 
    * @param shopId 매장 아이디
    */
   @GetMapping("/shops/{shopId}/menuGroups/all")
-  @OwnerShopCheck
-  public ResponseEntity<ShopMenuInfoResponse> shopMenuInfo(@PathVariable("shopId") long shopId) {
+  public ResponseEntity<ShopMenuInfoResponse> shopMenuInfo(@PathVariable("shopId") long shopId,
+                                                           HttpSession session) {
 
     ShopDTO shopInfo = shopService.getMyShopInfo(shopId);
-
+
+    String memberId = SessionUtil.getLoginMemberId(session);
+    if (memberId != null) {
+      recentShopViewService.add(memberId, shopId);
+    }
+
     if (shopInfo == null) {
       return new ResponseEntity<MenuGroupController.ShopMenuInfoResponse>(HttpStatus.NOT_FOUND); 
     }
@@ -160,9 +169,9 @@ public ResponseEntity<String> updateMenuGroup(
   @PutMapping("/shops/{shopId}/menuGroups/priority")
   @OwnerShopCheck
   public void updateMenuGroupPriority(
-      @PathVariable Long shopId, @RequestBody List<Long> iddList) {
+      @PathVariable Long shopId, @RequestBody List<Long> idList) {
 
-    menuGroupService.updateMenuGroupPriority(shopId, iddList);
+    menuGroupService.updateMenuGroupPriority(shopId, idList);
   }
 
   /**

src/main/java/com/delfood/controller/ShopSearchController.java

@@ -4,6 +4,7 @@
 import com.delfood.dto.ShopCategoryDTO;
 import com.delfood.dto.ShopDTO;
 import com.delfood.service.MemberService;
+import com.delfood.service.RecentShopViewService;
 import com.delfood.service.ShopSearchService;
 import com.delfood.service.ShopService;
 import com.delfood.utils.SessionUtil;
@@ -31,6 +32,9 @@ public class ShopSearchController {
   @Autowired
   private MemberService memberService;
 
+  @Autowired
+  private RecentShopViewService recentShopViewService;
+
   /**
    * 메인화면에서 큰 카테고리들을 조회한다. Ex) 치킨, 피자, 중국집 등
    * 
@@ -62,6 +66,17 @@ public GetShopByCategoryIdAndTownCodeResponse getShopsByCategoryIdAndTownCode(
             shopSearchService.shopSearchByCategory(categoryId, townCode));
   }
 
+  /**
+   * 최근 방문한 shop 조회
+   * @param session
+   * @return
+   */
+  @GetMapping("shops/recent")
+  @MemberLoginCheck
+  public List<ShopDTO> recentShopList(HttpSession session) {
+    String memberId = SessionUtil.getLoginMemberId(session);
+    return recentShopViewService.getRecentShopView(memberId);
+  }
 
 
   // ----------------------- Response 객체 -----------------------

src/main/java/com/delfood/dao/RecentShopViewDao.java

@@ -0,0 +1,46 @@
+package com.delfood.dao;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ZSetOperations;
+import org.springframework.stereotype.Repository;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+@Repository
+public class RecentShopViewDao {
+
+    private static final String RECENT_SHOP_VIEW_KEY = "recent:view:shop:";
+
+    // 최대 조회 가능한 매장수
+    private static final int MAX_LIST_SIZE = 10;
+
+    @Autowired
+    private RedisTemplate<String, Long> shopRedisTemplate;
+
+    /**
+     * 방문한 매장 정보를 추가한다.
+     *
+     * @param memberId 회원 아이디
+     * @param shopId 매장 아이디
+     */
+    public void add(String memberId, Long shopId) {
+        ZSetOperations<String, Long> zSetOperations = shopRedisTemplate.opsForZSet();
+        zSetOperations.add(RECENT_SHOP_VIEW_KEY + memberId, shopId, System.currentTimeMillis());
+        zSetOperations.removeRange(RECENT_SHOP_VIEW_KEY + memberId, MAX_LIST_SIZE + 1, -1);
+    }
+
+    /**
+     * 최근 조회한 매장목록을 조회한다.
+     * 키에 해당하는 매장목록이 없는 경우 빈 리스트 반환
+     *
+     * @param memberId 회원 아이디
+     * @return 최근 조회한 매장 목록
+     */
+    public List<Long> getRecentShopView(String memberId) {
+        return new ArrayList<>(Objects.requireNonNull(
+                shopRedisTemplate.opsForZSet().reverseRange(RECENT_SHOP_VIEW_KEY + memberId, 0, -1)));
+    }
+}

src/main/java/com/delfood/mapper/ShopMapper.java

@@ -3,6 +3,8 @@
 import com.delfood.dto.ShopDTO;
 import com.delfood.dto.ShopUpdateDTO;
 import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -117,9 +119,14 @@ public interface ShopMapper {
    */
   public List<ShopDTO> findByCategoryIdAndTownCode(Long categoryId, String townCode);
 
-
   public List<ShopDTO> findByBeOpen(String ownerId);
 
   public List<ShopDTO> findByBeClose(String ownerId);
 
+  /**
+   * 매장 조회
+   * @param shopIdList 매장 아이디 리스트
+   * @return 매장목록
+   */
+  public List<ShopDTO> findByIdList(@Param("shopIdList") List<Long> shopIdList);
 }

src/main/java/com/delfood/service/RecentShopViewService.java

@@ -0,0 +1,28 @@
+package com.delfood.service;
+
+import com.delfood.dao.RecentShopViewDao;
+import com.delfood.dto.ShopDTO;
+import com.delfood.mapper.ShopMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class RecentShopViewService {
+
+    @Autowired
+    RecentShopViewDao recentShopViewDao;
+
+    @Autowired
+    ShopMapper shopMapper;
+
+    public void add(String memberId, Long shopId) {
+        recentShopViewDao.add(memberId, shopId);
+    }
+
+    public List<ShopDTO> getRecentShopView(String memberId) {
+        List<Long> shopIdList = recentShopViewDao.getRecentShopView(memberId);
+        return shopMapper.findByIdList(shopIdList);
+    }
+}

src/main/resources/mybatis/mapper/shop.xml

@@ -172,4 +172,20 @@
         AND     owner_id = #{ownerId}
         AND     work_condition = 'OPEN'
     </select>
+
+    <select id="findByIdList" resultType="com.delfood.dto.ShopDTO">
+        <include refid="selectShop"></include>
+        WHERE id IN (
+        <foreach collection="shopIdList" separator="," item="shopId">
+            #{shopId}
+        </foreach>
+        )
+        ORDER BY FIELD(id,
+        <foreach collection="shopIdList" separator="," item="shopId">
+            #{shopId}
+        </foreach>
+        )
+    </select>
+
+
 </mapper>