diff --git a/.gitignore b/.gitignore
index 787780c..58e2d1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 application-oauth.properties
+application-redis.properties
 HELP.md
 .gradle
 build/
diff --git a/build.gradle b/build.gradle
index 2141db2..f0ce8f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,6 +52,9 @@ dependencies {
 	runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.2'
 	runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.2'
 
+	// redis
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
 	// QueryDsl
 	implementation 'com.querydsl:querydsl-jpa'
 
diff --git a/src/main/java/com/codepatissier/keki/calendar/DateCountCategory.java b/src/main/java/com/codepatissier/keki/calendar/DateCountCategory.java
new file mode 100644
index 0000000..e467c1c
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/calendar/DateCountCategory.java
@@ -0,0 +1,30 @@
+package com.codepatissier.keki.calendar;
+
+import lombok.Getter;
+
+@Getter
+public enum DateCountCategory {
+    ONE_HUNDRED(100, "100일"),
+    TWO_HUNDRED(200, "200일"),
+    THREE_HUNDRED(300, "200일"),
+    ONE_YEAR(365, "1주년"),
+    FOUR_HUNDRED(400, "400일"),
+    FIVE_HUNDRED(500, "500일"),
+    SIX_HUNDRED(600, "600일"),
+    SEVEN_HUNDRED(700, "700일"),
+    TWO_YEAR(730, "2주년"),
+    EIGHT_HUNDRED(800, "800일"),
+    NINE_HUNDRED(900, "900일"),
+    ONE_THOUSAND(1000, "1000일"),
+    THREE_YEAR(1095, "3주년"),
+    FOUR_YEAR(1460, "4주년"),
+    FIVE_YEAR(1825, "5주년"),
+    TWO_THOUSAND(2000, "2000일");
+    private int count;
+    private String date;
+
+    DateCountCategory(int count, String date){
+        this.count = count;
+        this.date = date;
+    }
+}
diff --git a/src/main/java/com/codepatissier/keki/calendar/contoller/CalendarController.java b/src/main/java/com/codepatissier/keki/calendar/contoller/CalendarController.java
index 5306e03..75e4f9f 100644
--- a/src/main/java/com/codepatissier/keki/calendar/contoller/CalendarController.java
+++ b/src/main/java/com/codepatissier/keki/calendar/contoller/CalendarController.java
@@ -10,12 +10,11 @@
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-// TODO STATUS 처리를 해줘야 함.
-
 @SecurityRequirement(name = "Bearer")
 @Tag(name = "calendars", description = "기념일 API")
 @RestController
@@ -30,9 +29,9 @@ public class CalendarController {
     @PostMapping("")
     public BaseResponse<String> createCalendar(@RequestBody CalendarReq calendarReq){
         try{
-            if(calendarReq.getTitle().equals("") || calendarReq.getTitle() == null) return new BaseResponse<>(BaseResponseStatus.NULL_TITLE);
-            if(calendarReq.getDate() == null || calendarReq.getDate().toString().equals("")) return new BaseResponse<>(BaseResponseStatus.NULL_DATE);
-            if(calendarReq.getKindOfCalendar() == null) return new BaseResponse<>(BaseResponseStatus.NULL_KIND_OF_CALENDARS);
+            if(!StringUtils.hasText(calendarReq.getTitle())) return new BaseResponse<>(BaseResponseStatus.NULL_TITLE);
+            if(!StringUtils.hasText(calendarReq.getDate().toString())) return new BaseResponse<>(BaseResponseStatus.NULL_DATE);
+            if(!StringUtils.hasText(calendarReq.getKindOfCalendar())) return new BaseResponse<>(BaseResponseStatus.NULL_KIND_OF_CALENDARS);
 
             this.calendarService.createCalendar(this.authService.getUserIdx(), calendarReq);
             return new BaseResponse<>(BaseResponseStatus.SUCCESS);
@@ -43,7 +42,7 @@ public BaseResponse<String> createCalendar(@RequestBody CalendarReq calendarReq)
 
     // 캘린더 수정
     @ResponseBody
-    @PatchMapping("/{calendarIdx}/edit")
+    @PatchMapping("/{calendarIdx}")
     public BaseResponse<String> modifyCalendar(@RequestBody CalendarReq calendarReq, @PathVariable("calendarIdx") Long calendarIdx){
         try{
             this.calendarService.modifyCalendar(this.authService.getUserIdx(), calendarReq, calendarIdx);
@@ -56,7 +55,7 @@ public BaseResponse<String> modifyCalendar(@RequestBody CalendarReq calendarReq,
     // 캘린더 수정 조회
     @ResponseBody
     @GetMapping("/{calendarIdx}/edit")
-    public BaseResponse<CalendarRes> getEditCalendar(@PathVariable("calendarIdx") Long calendarIdx){
+    public BaseResponse<CalendarEditRes> getEditCalendar(@PathVariable("calendarIdx") Long calendarIdx){
         try{
             return new BaseResponse<>(this.calendarService.getEditCalendar(this.authService.getUserIdx(), calendarIdx));
         }catch (BaseException e){
@@ -66,7 +65,7 @@ public BaseResponse<CalendarRes> getEditCalendar(@PathVariable("calendarIdx") Lo
 
     // 캘린더 삭제
     @ResponseBody
-    @PatchMapping("/{calendarIdx}")
+    @DeleteMapping("/{calendarIdx}")
     public BaseResponse<String> deleteCalendar(@PathVariable("calendarIdx") Long calendarIdx){
         try{
             this.calendarService.deleteCalendar(calendarIdx, this.authService.getUserIdx());
@@ -119,8 +118,8 @@ public BaseResponse<HomeRes> getHome(){
             }
             // 아닌 경우에는 가장 가까운 기념일을 불러오고
             HomeRes home = this.calendarService.getHomeCalendar(this.authService.getUserIdx());
-            // 기념일의 태그가 3개 미만이면 다 랜덤으로 불러오고
-            // 태그가 3개 이상이면 태그별로 랜덤하게 불러오기
+            // 기념일의 태그가 없으면 랜덤으로
+            // 아니면 기념일 태그의 게시물만
             return new BaseResponse<>(this.calendarService.getHomeTagPost(home));
         } catch (BaseException e) {
             return new BaseResponse<>(e.getStatus());
@@ -132,7 +131,7 @@ public BaseResponse<HomeRes> getHome(){
     @PostMapping("/categories")
     public BaseResponse<String> createTag(@RequestBody CalendarHashTag tag){
         try{
-            if(tag.getCalendarHashTag() == null) return new BaseResponse<>(BaseResponseStatus.NULL_TAG);
+            if(!StringUtils.hasText(tag.getCalendarHashTag())) return new BaseResponse<>(BaseResponseStatus.NULL_TAG);
             this.calendarService.createTag(tag);
             return new BaseResponse<>(BaseResponseStatus.SUCCESS);
         }catch (BaseException e){
@@ -145,7 +144,7 @@ public BaseResponse<String> createTag(@RequestBody CalendarHashTag tag){
     @PatchMapping("/categories")
     public BaseResponse<String> patchTag(@RequestBody TagStatus tag){
         try{
-            if(tag.getCalendarHashTag() == null) return new BaseResponse<>(BaseResponseStatus.NULL_TAG);
+            if(!StringUtils.hasText(tag.getCalendarHashTag())) return new BaseResponse<>(BaseResponseStatus.NULL_TAG);
             this.calendarService.patchTag(tag);
 
             return new BaseResponse<>(BaseResponseStatus.SUCCESS);
diff --git a/src/main/java/com/codepatissier/keki/calendar/dto/CalendarDateReturn.java b/src/main/java/com/codepatissier/keki/calendar/dto/CalendarDateReturn.java
new file mode 100644
index 0000000..afff3e6
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/calendar/dto/CalendarDateReturn.java
@@ -0,0 +1,14 @@
+package com.codepatissier.keki.calendar.dto;
+
+import com.codepatissier.keki.calendar.DateCountCategory;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+public class CalendarDateReturn {
+    private int calDate;
+    private DateCountCategory dateCountCategory;
+}
diff --git a/src/main/java/com/codepatissier/keki/calendar/dto/CalendarEditRes.java b/src/main/java/com/codepatissier/keki/calendar/dto/CalendarEditRes.java
new file mode 100644
index 0000000..63f6339
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/calendar/dto/CalendarEditRes.java
@@ -0,0 +1,22 @@
+package com.codepatissier.keki.calendar.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Setter
+
+public class CalendarEditRes {
+    private String kindOfCalendar; // 캘린더 종류
+    private String title;
+    private String date;
+
+    private List<CalendarHashTag> hashTags;
+    private List<CalendarHashTag> addHashTags;
+}
diff --git a/src/main/java/com/codepatissier/keki/calendar/dto/HomeRes.java b/src/main/java/com/codepatissier/keki/calendar/dto/HomeRes.java
index 678c4cd..f310659 100644
--- a/src/main/java/com/codepatissier/keki/calendar/dto/HomeRes.java
+++ b/src/main/java/com/codepatissier/keki/calendar/dto/HomeRes.java
@@ -1,5 +1,7 @@
 package com.codepatissier.keki.calendar.dto;
 
+import com.codepatissier.keki.calendar.entity.Calendar;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.querydsl.core.annotations.QueryProjection;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -17,4 +19,6 @@ public class HomeRes {
     private String calendarTitle;
     private int calendarDate;
     private List<HomeTagRes> homeTagResList;
+    @JsonIgnore
+    private Calendar calendar;
 }
diff --git a/src/main/java/com/codepatissier/keki/calendar/entity/Calendar.java b/src/main/java/com/codepatissier/keki/calendar/entity/Calendar.java
index 7f689ff..4b7326d 100644
--- a/src/main/java/com/codepatissier/keki/calendar/entity/Calendar.java
+++ b/src/main/java/com/codepatissier/keki/calendar/entity/Calendar.java
@@ -2,22 +2,24 @@
 
 import com.codepatissier.keki.calendar.CalendarCategory;
 import com.codepatissier.keki.common.BaseEntity;
+import com.codepatissier.keki.common.entityListener.CalendarEntityListener;
 import com.codepatissier.keki.user.entity.User;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.SQLDelete;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
-import java.util.Date;
 
 @Getter
 @Entity
 @NoArgsConstructor
 @DynamicInsert
+@SQLDelete(sql = "UPDATE calendar SET status = 'inactive', last_modified_date = current_timestamp WHERE calendar_idx = ?")
+@EntityListeners(CalendarEntityListener.class)
 public class Calendar extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/codepatissier/keki/calendar/entity/CalendarTag.java b/src/main/java/com/codepatissier/keki/calendar/entity/CalendarTag.java
index 9e17e58..83098f5 100644
--- a/src/main/java/com/codepatissier/keki/calendar/entity/CalendarTag.java
+++ b/src/main/java/com/codepatissier/keki/calendar/entity/CalendarTag.java
@@ -1,11 +1,12 @@
 package com.codepatissier.keki.calendar.entity;
 
 import com.codepatissier.keki.common.BaseEntity;
-import com.codepatissier.keki.common.Tag.Tag;
+import com.codepatissier.keki.common.tag.Tag;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.SQLDelete;
 
 import javax.persistence.*;
 
@@ -13,6 +14,7 @@
 @Entity
 @NoArgsConstructor
 @DynamicInsert
+@SQLDelete(sql = "UPDATE calendar_tag SET status = 'inactive', last_modified_date = current_timestamp WHERE calendar_tag_idx = ?")
 public class CalendarTag extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/codepatissier/keki/calendar/repository/Calendar/CalendarRepository.java b/src/main/java/com/codepatissier/keki/calendar/repository/Calendar/CalendarRepository.java
index e53fe68..8ee0f7c 100644
--- a/src/main/java/com/codepatissier/keki/calendar/repository/Calendar/CalendarRepository.java
+++ b/src/main/java/com/codepatissier/keki/calendar/repository/Calendar/CalendarRepository.java
@@ -12,4 +12,6 @@ public interface CalendarRepository extends JpaRepository<Calendar, Long> , Cale
     List<Calendar> findByUserAndStatus(User user, String status);
     Optional<Calendar> findByCalendarIdxAndStatus(Long calendarIdx, String status);
     List<Calendar> findByUserAndCalendarCategoryAndStatus(User user, CalendarCategory calendarCategory, String status);
+
+    void deleteByUser(User user);
 }
diff --git a/src/main/java/com/codepatissier/keki/calendar/repository/Calendar/CalendarRepositoryImpl.java b/src/main/java/com/codepatissier/keki/calendar/repository/Calendar/CalendarRepositoryImpl.java
index ec62a97..a22c5db 100644
--- a/src/main/java/com/codepatissier/keki/calendar/repository/Calendar/CalendarRepositoryImpl.java
+++ b/src/main/java/com/codepatissier/keki/calendar/repository/Calendar/CalendarRepositoryImpl.java
@@ -1,5 +1,6 @@
 package com.codepatissier.keki.calendar.repository.Calendar;
 
+import com.codepatissier.keki.calendar.CalendarCategory;
 import com.codepatissier.keki.calendar.dto.HomePostRes;
 import com.codepatissier.keki.calendar.dto.QHomePostRes;
 import com.codepatissier.keki.calendar.entity.Calendar;
@@ -10,6 +11,8 @@
 import lombok.RequiredArgsConstructor;
 
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAccessor;
 import java.util.List;
 
 import static com.codepatissier.keki.calendar.entity.QCalendar.calendar;
@@ -25,7 +28,18 @@ public class CalendarRepositoryImpl implements CalendarCustom {
     public Calendar getRecentDateCalendar(User userEntity) {
         LocalDate beginTimePath = LocalDate.now();
         return jpaQueryFactory.selectFrom(calendar)
-                .where(calendar.calendarDate.after(beginTimePath))
+                // 과거의 시간이거나
+                .where(calendar.calendarDate.after(beginTimePath).or(
+                        // 만약 날짜가 같은 경우에는
+                        // 디데이 일경우: 같은 날짜, 년도인 경우
+                        // 매년 반복: 같은 날짜인경우
+                        // 날짜 수: 같은 날짜, 같은 년도인 경우
+                        calendar.calendarDate.month().eq(beginTimePath.getMonth().getValue()).and(
+                                calendar.calendarDate.dayOfMonth().eq(beginTimePath.getDayOfMonth())
+                        ).and(calendar.calendarCategory.eq(CalendarCategory.EVERY_YEAR))
+                ).or(
+                        calendar.calendarDate.eq(beginTimePath)
+                ))
                 .where(calendar.user.userIdx.eq(userEntity.getUserIdx()))
                 .where(calendar.status.eq(Constant.ACTIVE_STATUS))
                 .orderBy(calendar.calendarDate.asc())
diff --git a/src/main/java/com/codepatissier/keki/calendar/repository/CalendarTag/CalendarTagCustom.java b/src/main/java/com/codepatissier/keki/calendar/repository/CalendarTag/CalendarTagCustom.java
index f2e50d7..6bca136 100644
--- a/src/main/java/com/codepatissier/keki/calendar/repository/CalendarTag/CalendarTagCustom.java
+++ b/src/main/java/com/codepatissier/keki/calendar/repository/CalendarTag/CalendarTagCustom.java
@@ -3,6 +3,7 @@
 import com.codepatissier.keki.calendar.dto.PopularTagRes;
 import com.codepatissier.keki.user.entity.User;
 
+import java.util.Calendar;
 import java.util.List;
 
 public interface CalendarTagCustom {
diff --git a/src/main/java/com/codepatissier/keki/calendar/repository/CalendarTag/CalendarTagRepository.java b/src/main/java/com/codepatissier/keki/calendar/repository/CalendarTag/CalendarTagRepository.java
index 0554ba2..855a7cc 100644
--- a/src/main/java/com/codepatissier/keki/calendar/repository/CalendarTag/CalendarTagRepository.java
+++ b/src/main/java/com/codepatissier/keki/calendar/repository/CalendarTag/CalendarTagRepository.java
@@ -2,12 +2,15 @@
 
 import com.codepatissier.keki.calendar.entity.Calendar;
 import com.codepatissier.keki.calendar.entity.CalendarTag;
-import com.codepatissier.keki.common.Tag.Tag;
+import com.codepatissier.keki.user.entity.User;
+import com.codepatissier.keki.common.tag.Tag;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
 
 public interface CalendarTagRepository extends JpaRepository<CalendarTag, Long>, CalendarTagCustom{
     List<CalendarTag> findByCalendarAndStatus(Calendar calendar, String activeStatus);
+    List<CalendarTag> findByCalendarUserAndStatus(User user, String status);
     CalendarTag findByCalendarAndTag(Calendar calendar, Tag byTagName);
+    void deleteByCalendar(Calendar calendar);
 }
diff --git a/src/main/java/com/codepatissier/keki/calendar/repository/CalendarTag/CalendarTagRepositoryImpl.java b/src/main/java/com/codepatissier/keki/calendar/repository/CalendarTag/CalendarTagRepositoryImpl.java
index e88c0e6..9d22983 100644
--- a/src/main/java/com/codepatissier/keki/calendar/repository/CalendarTag/CalendarTagRepositoryImpl.java
+++ b/src/main/java/com/codepatissier/keki/calendar/repository/CalendarTag/CalendarTagRepositoryImpl.java
@@ -11,7 +11,7 @@
 
 import static com.codepatissier.keki.calendar.entity.QCalendar.calendar;
 import static com.codepatissier.keki.calendar.entity.QCalendarTag.calendarTag;
-import static com.codepatissier.keki.common.Tag.QTag.tag;
+import static com.codepatissier.keki.common.tag.QTag.tag;
 import static com.codepatissier.keki.user.entity.QUser.user;
 
 @RequiredArgsConstructor
@@ -35,6 +35,7 @@ public List<PopularTagRes> getPopularCalendarTag() {
 
     /**
      * 사용자 별 인기 Tag 3개
+     * 다음에 쓸수 있으니, 혹시 몰라서 지우지 않고 남겨둘게요!
      */
     @Override
     public List<PopularTagRes> getPopularCalendarTagByUser(User userEntity) {
@@ -45,9 +46,11 @@ public List<PopularTagRes> getPopularCalendarTagByUser(User userEntity) {
                 .leftJoin(user).on(calendar.user.eq(user))
                 .where(user.userIdx.eq(userEntity.getUserIdx()))
                 .where(tag.status.eq(Constant.ACTIVE_STATUS))
+                .where(calendarTag.status.eq(Constant.ACTIVE_STATUS))
                 .groupBy(tag.tagIdx)
                 .orderBy(tag.tagIdx.count().desc())
                 .limit(Constant.Home.HOME_RETURN_TAG_COUNT)
                 .fetch();
     }
+
 }
diff --git a/src/main/java/com/codepatissier/keki/calendar/service/CalendarService.java b/src/main/java/com/codepatissier/keki/calendar/service/CalendarService.java
index 1e26add..0b589d6 100644
--- a/src/main/java/com/codepatissier/keki/calendar/service/CalendarService.java
+++ b/src/main/java/com/codepatissier/keki/calendar/service/CalendarService.java
@@ -1,6 +1,7 @@
 package com.codepatissier.keki.calendar.service;
 
 import com.codepatissier.keki.calendar.CalendarCategory;
+import com.codepatissier.keki.calendar.DateCountCategory;
 import com.codepatissier.keki.calendar.dto.*;
 import com.codepatissier.keki.calendar.entity.Calendar;
 import com.codepatissier.keki.calendar.entity.CalendarTag;
@@ -9,11 +10,12 @@
 import com.codepatissier.keki.common.BaseException;
 import com.codepatissier.keki.common.BaseResponseStatus;
 import com.codepatissier.keki.common.Constant;
-import com.codepatissier.keki.common.Tag.Tag;
-import com.codepatissier.keki.common.Tag.TagRepository;
+import com.codepatissier.keki.common.tag.Tag;
+import com.codepatissier.keki.common.tag.TagRepository;
 import com.codepatissier.keki.user.entity.User;
 import com.codepatissier.keki.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -28,6 +30,7 @@
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class CalendarService {
     private final CalendarRepository calendarRepository;
     private final CalendarTagRepository calendarTagRepository;
@@ -90,8 +93,7 @@ public void deleteCalendar(Long calendarIdx, Long userIdx) throws BaseException{
             if(!calendar.getUser().equals(user) || user.getStatus().equals(INACTIVE_STATUS)){
                 throw new BaseException(BaseResponseStatus.INVALID_USER_AND_STATUS);
             }
-            changeCalendarStatus(calendar, INACTIVE_STATUS);
-            changeCalendarTagStatus(calendar, INACTIVE_STATUS);
+            this.calendarRepository.delete(calendar);
         }catch (Exception e){
             throw new BaseException(BaseResponseStatus.DATABASE_ERROR);
         }
@@ -140,6 +142,16 @@ private int calculateDate(Calendar calendar) {
         return returnCalendar;
     }
 
+    // 날짜 수 기념일 계산 (100일, 200일, 300일 등등)
+    // 현재 2000일 미만으로 불러오도록 생성
+    private CalendarDateReturn calculateDateForDateCount(Calendar cal) {
+        int day = this.calculateDate(cal) - 1; // 날짜수를 구함 -> 기존에 +1 을 해서 return 하기 때문에 +1을 해줌
+        for(DateCountCategory count: DateCountCategory.values()){
+            if(day <= count.getCount()) return new CalendarDateReturn(count.getCount()-day, count);
+        }
+        return new CalendarDateReturn(day, null);
+    }
+
     // 기념일 계산 return String
     private String calculateDateReturnString(int day){
         String returnCalendar;
@@ -200,36 +212,54 @@ public void patchTag(TagStatus tag) throws BaseException{
         }
     }
 
+    // 홈 기념일 조회
     public HomeRes getHomeCalendar(Long userIdx) throws BaseException{
         User user = this.findUserByUserIdx(userIdx);
         try{
+            int day = Integer.MAX_VALUE;
             Calendar calendar = this.calendarRepository.getRecentDateCalendar(user); // 현재 가장 가까운 캘린더 불러오기
-            int day = 0;
-            String title = null;
             if(calendar != null){
-                title = calendar.getCalendarTitle();
-                day = (int) Duration.between(calendar.getCalendarDate().atStartOfDay(), LocalDate.now().atStartOfDay()).toDays();
+                day = this.calculateDate(calendar);
             }
+            List<Calendar> listEYCalendars = this.calendarRepository.findByUserAndCalendarCategoryAndStatus(user, CalendarCategory.EVERY_YEAR, ACTIVE_STATUS);
+
+
             // 사용자의 매년 반복 캘린더 불러와서 하나씩 비교해보고, 값이 더 가까우면? 매년 반복으로 홈 화면 기념일 불러오기
-            List<Calendar> listCalendars = this.calendarRepository.findByUserAndCalendarCategoryAndStatus(user, CalendarCategory.EVERY_YEAR, ACTIVE_STATUS);
-            for(Calendar cal: listCalendars){
-                if(this.calculateDate(cal) > day){
-                    title = cal.getCalendarTitle();
-                    day = this.calculateDate(cal);
+            for(Calendar cal: listEYCalendars){
+                int calDay = this.calculateDate(cal);
+                if(calDay < Math.abs(day)){
+                    calendar = cal;
+                    day = calDay;
                 }
             }
-            return new HomeRes(user.getUserIdx(), user.getNickname(), title, Math.abs(day), null);
 
+            // 날짜 수인 경우 100일, 200일 불러오기
+            List<Calendar> listDCCalendars = this.calendarRepository.findByUserAndCalendarCategoryAndStatus(user, CalendarCategory.DATE_COUNT, ACTIVE_STATUS);
+            for (Calendar cal : listDCCalendars) {
+                CalendarDateReturn calDateReturn = this.calculateDateForDateCount(cal);
+                if (calDateReturn.getCalDate()<Math.abs(day) && calDateReturn.getDateCountCategory() != null) {
+                    calendar = cal;
+                    calendar.setCalendarTitle(calendar.getCalendarTitle()+"의 " + calDateReturn.getDateCountCategory().getDate());
+                    day = calDateReturn.getCalDate();
+                }
+            }
+
+            if(calendar != null){
+                return new HomeRes(user.getUserIdx(), user.getNickname(), calendar.getCalendarTitle(), Math.abs(day), null, calendar);
+            }
+            return new HomeRes(user.getUserIdx(), user.getNickname(), null, 0, null, null);
         }catch (Exception e){
             throw new BaseException(BaseResponseStatus.DATABASE_ERROR);
         }
     }
 
+
+
     // 로그 아웃 된 상태에서 홈 정보 불러오기
     public HomeRes getHomeCalendarAndPostLogout() throws BaseException{
         try{
             return new HomeRes(null, null, null, 0,
-                    getPostByTag(this.calendarTagRepository.getPopularCalendarTag()));
+                    getPostByTag(this.calendarTagRepository.getPopularCalendarTag()),null);
         }catch (Exception e){
             throw new BaseException(BaseResponseStatus.DATABASE_ERROR);
         }
@@ -238,15 +268,19 @@ public HomeRes getHomeCalendarAndPostLogout() throws BaseException{
 
     // home api
     public HomeRes getHomeTagPost(HomeRes home) throws BaseException{
-        User user = this.findUserByUserIdx(home.getUserIdx());
         try{
-            List<PopularTagRes> tags = this.calendarTagRepository.getPopularCalendarTagByUser(user);
-            // 기념일의 태그가 3개 미만이면 다 랜덤으로 불러오고
-            if(tags.size()< Constant.Home.HOME_RETURN_TAG_COUNT){
-                home.setHomeTagResList(this.getPostByTag(this.calendarTagRepository.getPopularCalendarTag()));
-            }else{ // 태그가 3개 이상이면 태그별로 랜덤하게 불러오기
-                home.setHomeTagResList(this.getPostByTag(tags));
+            if(home.getCalendar() == null) home.setHomeTagResList(this.getPostByTag(this.calendarTagRepository.getPopularCalendarTag()));
+            else{
+                List<PopularTagRes> tags = this.calendarTagRepository.findByCalendarAndStatus(home.getCalendar(), ACTIVE_STATUS).stream()
+                        .map(cal -> new PopularTagRes(cal.getTag().getTagIdx(), cal.getTag().getTagName())).collect(Collectors.toList());
+                // 기념일의 태그가 3개 미만이면 다 랜덤으로 불러오고
+                if(tags.size()==0){
+                    home.setHomeTagResList(this.getPostByTag(this.calendarTagRepository.getPopularCalendarTag()));
+                }else{ // 태그가 3개 이상이면 태그별로 랜덤하게 불러오기
+                    home.setHomeTagResList(this.getPostByTag(tags));
+                }
             }
+
             return home;
         }catch (Exception e){
             throw new BaseException(BaseResponseStatus.DATABASE_ERROR);
@@ -262,8 +296,6 @@ public void modifyCalendar(Long userIdx, CalendarReq calendarReq, Long calendarI
             Calendar calendar = this.findCalendarByCalendarIdx(calendarIdx);
             if (calendar.getUser() != user) throw new BaseException(BaseResponseStatus.NO_MATCH_CALENDAR_USER);
 
-
-            // TODO: 현재 수정 시 TAG의 경우에는 INACTIVE 후 새로 받은 것을 ACTIVE로 함 => DELETE로 변경?
             if (calendarReq.getTitle() != null){
                 if(calendarReq.getTitle().equals("") || calendarReq.getTitle().equals(" "))
                     throw new BaseException(BaseResponseStatus.NULL_CALENDAR_TITLE);
@@ -278,9 +310,8 @@ public void modifyCalendar(Long userIdx, CalendarReq calendarReq, Long calendarI
                     throw new BaseException(BaseResponseStatus.NULL_CALENDAR_CATEGORY);
                 calendar.setCalendarCategory(CalendarCategory.getCalendarCategoryByName(calendarReq.getKindOfCalendar()));
             }
-
+            this.calendarTagRepository.deleteByCalendar(calendar);
             if (calendarReq.getHashTags() != null && calendarReq.getHashTags().size() != 0) {
-                this.changeCalendarTagStatus(calendar, INACTIVE_STATUS);
                 for (CalendarHashTag hashTag : calendarReq.getHashTags()) {
                     CalendarTag calendarTag =  this.calendarTagRepository.findByCalendarAndTag(calendar, this.findByTagName(hashTag));
                     if(calendarTag == null) saveHashTags(calendar, hashTag);
@@ -296,22 +327,11 @@ public void modifyCalendar(Long userIdx, CalendarReq calendarReq, Long calendarI
     }
 
     // 캘린더 수정 조회 api
-    public CalendarRes getEditCalendar(Long userIdx, Long calendarIdx) throws BaseException{
-        User user = findUserByUserIdx(userIdx);
-        Calendar calendar = findCalendarByCalendarIdx(calendarIdx);
-        List<Tag> tags = this.tagRepository.findByStatus(ACTIVE_STATUS);
-
-        if (calendar.getUser() != user) throw new BaseException(BaseResponseStatus.NO_MATCH_CALENDAR_USER);
-
-        try {
-            return new CalendarRes(calendar.getCalendarCategory().getName(),
-                    calendar.getCalendarTitle(),
-                    calendar.getCalendarDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),
-                    calculateDateReturnString(calculateDate(calendar)),
-                    tags.stream().map(tag -> new CalendarHashTag(tag.getTagName())).collect(Collectors.toList()));
-        } catch (Exception e) {
-            throw new BaseException(BaseResponseStatus.DATABASE_ERROR);
-        }
+    public CalendarEditRes getEditCalendar(Long userIdx, Long calendarIdx) throws BaseException{
+        CalendarRes calendar = this.getCalendar(calendarIdx, userIdx);
+        return new CalendarEditRes(calendar.getKindOfCalendar(), calendar.getTitle(), calendar.getDate(),
+                calendar.getHashTags(), this.tagRepository.findByStatus(ACTIVE_STATUS).stream()
+                .map(tag -> new CalendarHashTag(tag.getTagName())).collect(Collectors.toList()));
     }
 
 
@@ -332,19 +352,6 @@ private Calendar findCalendarByCalendarIdx(Long calendarIdx) throws BaseExceptio
                 .orElseThrow(() -> new BaseException(BaseResponseStatus.INVALID_CALENDAR_IDX));
     }
 
-    // 태그 상태 변경
-    private void changeCalendarTagStatus(Calendar calendar, String status){
-        String getStatus = null;
-        if(status.equals(ACTIVE_STATUS)) getStatus = INACTIVE_STATUS;
-        else getStatus = ACTIVE_STATUS;
-
-        this.calendarTagRepository.findByCalendarAndStatus(calendar, getStatus).stream()
-                .forEach(tag -> {
-                    tag.setStatus(status);
-                    this.calendarTagRepository.save(tag);
-                });
-    }
-
     // tag 별 게시물 찾기
     private List<HomeTagRes> getPostByTag(List<PopularTagRes> popularTagRes) {
         return popularTagRes.stream()
@@ -353,12 +360,6 @@ private List<HomeTagRes> getPostByTag(List<PopularTagRes> popularTagRes) {
                 .collect(Collectors.toList());
     }
 
-    // 캘린더 상태 변경 [삭제 시]
-    private void changeCalendarStatus(Calendar calendar, String status) {
-        calendar.setStatus(status);
-        this.calendarRepository.save(calendar);
-    }
-
     // tag 저장
     private void saveHashTags(Calendar calendar, CalendarHashTag hashtag) throws BaseException {
         this.calendarTagRepository.save(CalendarTag.builder()
diff --git a/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java b/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java
index 07a1d55..c865cde 100644
--- a/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java
+++ b/src/main/java/com/codepatissier/keki/common/BaseResponseStatus.java
@@ -14,14 +14,24 @@ public enum BaseResponseStatus {
      *  2000: Request 오류
      */
     // users(2000~2099)
-     NULL_TOKEN(false, 2000, "토큰 값을 입력해주세요."),
+    NULL_TOKEN(false, 2000, "토큰 값을 입력해주세요."),
     NULL_EMAIL(false, 2001, "이메일을 입력해주세요."),
     NULL_PROVIDER(false, 2002, "소셜 이름을 입력해주세요."),
     INVALID_PROVIDER(false, 2003, "잘못된 소셜 이름입니다."),
-    ALREADY_WITHDRAW_USER(false, 2003, "이미 삭제된 회원입니다."),
+    ALREADY_WITHDRAW_USER(false, 2004, "이미 탈퇴한 회원입니다."),
+    INVALID_TOKEN(false, 2005, "유효하지 않은 토큰 값입니다."),
+    UNSUPPORTED_TOKEN(false, 2006, "잘못된 형식의 토큰 값입니다."),
+    MALFORMED_TOKEN(false, 2007, "잘못된 구조의 토큰 값입니다."),
 
-    // stores(2100~2199)
 
+    // stores(2100~2199)
+    NULL_ADDRESS(false, 2100, "주소를 입력해주세요."),
+    NULL_ORDER_URL(false, 2101, "주문 링크를 입력해주세요."),
+    NULL_BUSINESS_NAME(false, 2102, "대표자명을 입력해주세요."),
+    NULL_BRAND_NAME(false, 2103, "상호명을 입력해주세요."),
+    NULL_BUSINESS_ADDRESS(false, 2104, "사업자 주소를 입력해주세요."),
+    NULL_BUSINESS_NUMBER(false, 2105, "사업자 번호를 입력해주세요."),
+    NULL_NICKNAME(false, 2106, "가게 이름을 입력해주세요."),
 
     // posts(2200~2299)
     INVALID_POSTS_SIZE(false, 2200, "리스트 사이즈는 1 이상이어야 합니다."),
@@ -38,7 +48,11 @@ public enum BaseResponseStatus {
     INVALID_TAG_NUM(false, 2210, "태그는 1개~3개로 등록해주세요."),
 
     // desserts(2300~2399)
-
+    NULL_DESSERT_IMG(false, 3301, "디저트 이미지를 추가해주세요."),
+    NULL_DESSERT_NAME(false, 3302, "디저트 이름을 입력해주세요."),
+    INVALID_DESERT_PRICE(false, 3303, "디저트 가격은 0원 이상이어야 합니다."),
+    NULL_DESSERT_DESCRIPTION(false, 3304, "디저트 설명을 입력해주세요."),
+    DELETED_DESSERT(false, 3305, "이미 삭제된 디저트입니다."),
 
     // calendars(2400~2499)
     NULL_TITLE(false, 2400, "캘린더 제목을 입력해주세요."),
@@ -58,18 +72,10 @@ public enum BaseResponseStatus {
     INVALID_EMAIL(false, 3002, "존재하지 않는 이메일입니다."),
     NO_STORE_ROLE(false, 3003, "판매자가 아닙니다."),
     INVALID_USER_STATUS(false, 3004, "비활성화된 사용자입니다."),
-    INVALID_TOKEN(false, 3005, "잘못된 토큰 값입니다."),
-    EXPIRED_TOKEN(false, 3006, "만료된 토큰 값입니다."),
+    EXPIRED_TOKEN(false, 3005, "만료된 토큰 값입니다."),
 
     // stores(3100~3199)
     INVALID_STORE_IDX(false, 3100, "존재하지 않는 스토어입니다."),
-    NULL_ADDRESS(false, 3101, "주소를 입력해주세요."),
-    NULL_ORDER_URL(false, 3102, "주문 링크를 입력해주세요."),
-    NULL_BUSINESS_NAME(false, 3103, "대표자명을 입력해주세요."),
-    NULL_BRAND_NAME(false, 3104, "상호명을 입력해주세요."),
-    NULL_BUSINESS_ADDRESS(false, 3105, "사업자 주소를 입력해주세요."),
-    NULL_BUSINESS_NUMBER(false, 3106, "사업자 번호를 입력해주세요."),
-    NULL_NICKNAME(false, 3107, "가게 이름을 입력해주세요."),
 
     // posts(3200~3299)
     INVALID_POST_IDX(false, 3200, "존재하지 않는 피드입니다."),
@@ -77,10 +83,6 @@ public enum BaseResponseStatus {
 
     // desserts(3300~3399)
     INVALID_DESSERT_IDX(false, 3300, "존재하지 않는 디저트입니다."),
-    NULL_DESSERT_IMG(false, 3301, "디저트 이미지를 추가해주세요."),
-    NULL_DESSERT_NAME(false, 3302, "디저트 이름을 입력해주세요."),
-    INVALID_DESERT_PRICE(false, 3303, "디저트 가격은 0원 이상이어야 합니다."),
-    NULL_DESSERT_DESCRIPTION(false, 3304, "디저트 설명을 입력해주세요."),
 
     // calendars(3400~3499)
     INVALID_CALENDAR_TAG(false, 3400, "캘린더 TAG를 찾을 수 없습니다."),
diff --git a/src/main/java/com/codepatissier/keki/common/BeanUtils.java b/src/main/java/com/codepatissier/keki/common/BeanUtils.java
new file mode 100644
index 0000000..25662f4
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/common/BeanUtils.java
@@ -0,0 +1,19 @@
+package com.codepatissier.keki.common;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+@Component
+public class BeanUtils implements ApplicationContextAware {
+    private static ApplicationContext applicationContext;
+
+    @Override
+    public void setApplicationContext(ApplicationContext act) throws BeansException {
+        applicationContext = act;
+    }
+    public static <T> T getBean(Class<T> tClass){
+        return applicationContext.getBean(tClass);
+    }
+}
diff --git a/src/main/java/com/codepatissier/keki/common/config/RedisConfig.java b/src/main/java/com/codepatissier/keki/common/config/RedisConfig.java
new file mode 100644
index 0000000..413f5e6
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/common/config/RedisConfig.java
@@ -0,0 +1,38 @@
+package com.codepatissier.keki.common.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+
+@Configuration
+public class RedisConfig {
+
+    @Value("${spring.redis.host}")
+    private String host;
+
+    @Value("${spring.redis.port}")
+    private int port;
+
+    @Value("${spring.redis.password}")
+    private String password;
+
+    @Bean
+    public RedisConnectionFactory redisConnectionFactory() {
+        RedisStandaloneConfiguration redisStandaloneConfiguration = new RedisStandaloneConfiguration();
+        redisStandaloneConfiguration.setHostName(host);
+        redisStandaloneConfiguration.setPort(port);
+        redisStandaloneConfiguration.setPassword(password);
+        return new LettuceConnectionFactory(redisStandaloneConfiguration);
+    }
+
+    @Bean
+    public RedisTemplate<?, ?> redisTemplate() {
+        RedisTemplate<?, ?> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(redisConnectionFactory());
+        return redisTemplate;
+    }
+}
diff --git a/src/main/java/com/codepatissier/keki/common/entityListener/CalendarEntityListener.java b/src/main/java/com/codepatissier/keki/common/entityListener/CalendarEntityListener.java
new file mode 100644
index 0000000..ec95c1f
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/common/entityListener/CalendarEntityListener.java
@@ -0,0 +1,16 @@
+package com.codepatissier.keki.common.entityListener;
+
+import com.codepatissier.keki.calendar.entity.Calendar;
+import com.codepatissier.keki.calendar.repository.CalendarTag.CalendarTagRepository;
+import com.codepatissier.keki.common.BeanUtils;
+
+import javax.persistence.PreRemove;
+
+public class CalendarEntityListener {
+
+    @PreRemove
+    public void onUpdate(Calendar calendar){
+        CalendarTagRepository calendarTagRepository = BeanUtils.getBean(CalendarTagRepository.class);
+        calendarTagRepository.deleteByCalendar(calendar);
+    }
+}
diff --git a/src/main/java/com/codepatissier/keki/common/entityListener/DessertEntityListener.java b/src/main/java/com/codepatissier/keki/common/entityListener/DessertEntityListener.java
new file mode 100644
index 0000000..e301e52
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/common/entityListener/DessertEntityListener.java
@@ -0,0 +1,16 @@
+package com.codepatissier.keki.common.entityListener;
+
+import com.codepatissier.keki.common.BeanUtils;
+import com.codepatissier.keki.dessert.entity.Dessert;
+import com.codepatissier.keki.post.repository.PostRepository;
+
+import javax.persistence.PreRemove;
+
+public class DessertEntityListener {
+
+    @PreRemove
+    public void onUpdate(Dessert dessert){
+        PostRepository postRepository = BeanUtils.getBean(PostRepository.class);
+        postRepository.deleteByDessert(dessert);
+    }
+}
diff --git a/src/main/java/com/codepatissier/keki/common/entityListener/PostEntityListener.java b/src/main/java/com/codepatissier/keki/common/entityListener/PostEntityListener.java
new file mode 100644
index 0000000..1f10606
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/common/entityListener/PostEntityListener.java
@@ -0,0 +1,20 @@
+package com.codepatissier.keki.common.entityListener;
+
+import com.codepatissier.keki.common.BeanUtils;
+import com.codepatissier.keki.history.repository.PostHistoryRepository;
+import com.codepatissier.keki.post.entity.Post;
+import com.codepatissier.keki.post.repository.PostLikeRepository;
+
+import javax.persistence.PreRemove;
+
+public class PostEntityListener {
+
+    @PreRemove
+    public void onUpdate(Post post){
+        PostLikeRepository postLikeRepository = BeanUtils.getBean(PostLikeRepository.class);
+        postLikeRepository.deleteByPost(post);
+
+        PostHistoryRepository postHistoryRepository = BeanUtils.getBean(PostHistoryRepository.class);
+        postHistoryRepository.deleteByPost(post);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/codepatissier/keki/common/entityListener/StoreEntityListener.java b/src/main/java/com/codepatissier/keki/common/entityListener/StoreEntityListener.java
new file mode 100644
index 0000000..8dcc438
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/common/entityListener/StoreEntityListener.java
@@ -0,0 +1,16 @@
+package com.codepatissier.keki.common.entityListener;
+
+import com.codepatissier.keki.common.BeanUtils;
+import com.codepatissier.keki.dessert.repository.DessertRepository;
+import com.codepatissier.keki.store.entity.Store;
+
+import javax.persistence.PreRemove;
+
+public class StoreEntityListener {
+
+    @PreRemove
+    public void onUpdate(Store store){
+        DessertRepository dessertRepository = BeanUtils.getBean(DessertRepository.class);
+        dessertRepository.deleteByStore(store);
+    }
+}
diff --git a/src/main/java/com/codepatissier/keki/common/entityListener/UserEntityListener.java b/src/main/java/com/codepatissier/keki/common/entityListener/UserEntityListener.java
new file mode 100644
index 0000000..36de0b6
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/common/entityListener/UserEntityListener.java
@@ -0,0 +1,33 @@
+package com.codepatissier.keki.common.entityListener;
+
+import com.codepatissier.keki.calendar.repository.Calendar.CalendarRepository;
+import com.codepatissier.keki.common.BeanUtils;
+import com.codepatissier.keki.common.Role;
+import com.codepatissier.keki.history.repository.PostHistoryRepository;
+import com.codepatissier.keki.history.repository.SearchHistoryRepository;
+import com.codepatissier.keki.post.repository.PostLikeRepository;
+import com.codepatissier.keki.store.repository.StoreRepository;
+import com.codepatissier.keki.user.entity.User;
+
+import javax.persistence.PreRemove;
+
+public class UserEntityListener {
+
+    @PreRemove
+    public void onUpdate(User user){
+        if(Role.getRoleByName(user.getRole())==Role.CUSTOMER){
+            PostLikeRepository postLikeRepository = BeanUtils.getBean(PostLikeRepository.class);
+            postLikeRepository.deleteByUser(user);
+            PostHistoryRepository postHistoryRepository = BeanUtils.getBean(PostHistoryRepository.class);
+            postHistoryRepository.deleteByUser(user);
+            SearchHistoryRepository searchHistoryRepository = BeanUtils.getBean(SearchHistoryRepository.class);
+            searchHistoryRepository.deleteByUser(user);
+            CalendarRepository calendarRepository = BeanUtils.getBean(CalendarRepository.class);
+            calendarRepository.deleteByUser(user);
+        } else if(Role.getRoleByName(user.getRole())==Role.STORE){
+            StoreRepository storeRepository = BeanUtils.getBean(StoreRepository.class);
+            storeRepository.deleteByUser(user);
+        }
+        user.signout();
+    }
+}
diff --git a/src/main/java/com/codepatissier/keki/common/Tag/Tag.java b/src/main/java/com/codepatissier/keki/common/tag/Tag.java
similarity index 92%
rename from src/main/java/com/codepatissier/keki/common/Tag/Tag.java
rename to src/main/java/com/codepatissier/keki/common/tag/Tag.java
index cc3204c..bcb9f8a 100644
--- a/src/main/java/com/codepatissier/keki/common/Tag/Tag.java
+++ b/src/main/java/com/codepatissier/keki/common/tag/Tag.java
@@ -1,4 +1,4 @@
-package com.codepatissier.keki.common.Tag;
+package com.codepatissier.keki.common.tag;
 
 import com.codepatissier.keki.common.BaseEntity;
 import lombok.Builder;
diff --git a/src/main/java/com/codepatissier/keki/common/Tag/TagRepository.java b/src/main/java/com/codepatissier/keki/common/tag/TagRepository.java
similarity index 87%
rename from src/main/java/com/codepatissier/keki/common/Tag/TagRepository.java
rename to src/main/java/com/codepatissier/keki/common/tag/TagRepository.java
index ae5006e..30604ab 100644
--- a/src/main/java/com/codepatissier/keki/common/Tag/TagRepository.java
+++ b/src/main/java/com/codepatissier/keki/common/tag/TagRepository.java
@@ -1,4 +1,4 @@
-package com.codepatissier.keki.common.Tag;
+package com.codepatissier.keki.common.tag;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
diff --git a/src/main/java/com/codepatissier/keki/dessert/controller/DessertController.java b/src/main/java/com/codepatissier/keki/dessert/controller/DessertController.java
index 71e0d72..f40603b 100644
--- a/src/main/java/com/codepatissier/keki/dessert/controller/DessertController.java
+++ b/src/main/java/com/codepatissier/keki/dessert/controller/DessertController.java
@@ -45,7 +45,6 @@ public BaseResponse<GetStoreDessertsRes> getDessertList(Long storeIdx, @RequestP
         } catch (BaseException e) {
             return new BaseResponse<>(e.getStatus());
         }
-
     }
 
     /**
@@ -79,10 +78,10 @@ public BaseResponse<String> addDessert(@Valid @RequestBody PostDessertReq postDe
 
     /**
      * [판매자] 상품 삭제
-     * [PATCH] /desserts/:dessertIdx
+     * [DELETE] /desserts/:dessertIdx
      */
     @ResponseBody
-    @PatchMapping("/{dessertIdx}")
+    @DeleteMapping("/{dessertIdx}")
     public BaseResponse<String> deleteDessert(@PathVariable("dessertIdx") Long dessertIdx) {
         try {
             dessertService.deleteDessert(authService.getUserIdx(), dessertIdx);
@@ -94,10 +93,10 @@ public BaseResponse<String> deleteDessert(@PathVariable("dessertIdx") Long desse
 
     /**
      * [판매자] 상품 수정
-     * [PATCH] /desserts/:dessertIdx/editDessert
+     * [PATCH] /desserts/:dessertIdx
      */
     @ResponseBody
-    @PatchMapping("/{dessertIdx}/editDessert")
+    @PatchMapping("/{dessertIdx}")
     public BaseResponse<String> editDessert(@RequestBody PatchDessertReq patchDessertReq, @PathVariable("dessertIdx") Long dessertIdx) {
         try {
             dessertService.modifyDessert(patchDessertReq, dessertIdx, authService.getUserIdx());
diff --git a/src/main/java/com/codepatissier/keki/dessert/dto/GetDessertRes.java b/src/main/java/com/codepatissier/keki/dessert/dto/GetDessertRes.java
index f8d7aa0..8ea4f63 100644
--- a/src/main/java/com/codepatissier/keki/dessert/dto/GetDessertRes.java
+++ b/src/main/java/com/codepatissier/keki/dessert/dto/GetDessertRes.java
@@ -21,7 +21,7 @@ public class GetDessertRes {
     @AllArgsConstructor
     @NoArgsConstructor
     public static class Image {
-        private Long postIdx;
-        private String postImgUrl;
+        private Long imgIdx;
+        private String imgUrl;
     }
 }
diff --git a/src/main/java/com/codepatissier/keki/dessert/dto/OptionDTO.java b/src/main/java/com/codepatissier/keki/dessert/dto/OptionDTO.java
new file mode 100644
index 0000000..79b4280
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/dessert/dto/OptionDTO.java
@@ -0,0 +1,13 @@
+package com.codepatissier.keki.dessert.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class OptionDTO {
+        private String optionDescription;
+        private Integer optionPrice;
+}
diff --git a/src/main/java/com/codepatissier/keki/dessert/dto/PostDessertReq.java b/src/main/java/com/codepatissier/keki/dessert/dto/PostDessertReq.java
index 4837a86..4ce3135 100644
--- a/src/main/java/com/codepatissier/keki/dessert/dto/PostDessertReq.java
+++ b/src/main/java/com/codepatissier/keki/dessert/dto/PostDessertReq.java
@@ -1,10 +1,14 @@
 package com.codepatissier.keki.dessert.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.PositiveOrZero;
+import java.util.List;
 
 @Data
 public class PostDessertReq {
@@ -17,4 +21,5 @@ public class PostDessertReq {
     private String dessertDescription;
     @NotBlank(message = "디저트 이미지는 필수 항목입니다.")
     private String dessertImg;
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/codepatissier/keki/dessert/entity/Dessert.java b/src/main/java/com/codepatissier/keki/dessert/entity/Dessert.java
index 990d5eb..d7e7955 100644
--- a/src/main/java/com/codepatissier/keki/dessert/entity/Dessert.java
+++ b/src/main/java/com/codepatissier/keki/dessert/entity/Dessert.java
@@ -1,11 +1,13 @@
 package com.codepatissier.keki.dessert.entity;
 
 import com.codepatissier.keki.common.BaseEntity;
+import com.codepatissier.keki.common.entityListener.DessertEntityListener;
 import com.codepatissier.keki.store.entity.Store;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.SQLDelete;
 
 import javax.persistence.*;
 
@@ -13,6 +15,8 @@
 @Entity
 @NoArgsConstructor
 @DynamicInsert
+@SQLDelete(sql = "UPDATE dessert SET status = 'inactive', last_modified_date = current_timestamp WHERE dessert_idx = ?")
+@EntityListeners(DessertEntityListener.class)
 public class Dessert extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/codepatissier/keki/dessert/entity/Option.java b/src/main/java/com/codepatissier/keki/dessert/entity/Option.java
new file mode 100644
index 0000000..b910bfc
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/dessert/entity/Option.java
@@ -0,0 +1,38 @@
+package com.codepatissier.keki.dessert.entity;
+
+import com.codepatissier.keki.common.BaseEntity;
+
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+
+import javax.persistence.*;
+
+@Table(name = "options")
+@Getter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+public class Option extends BaseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long optionIdx;
+
+    @ManyToOne
+    @JoinColumn(nullable = false, name = "dessertIdx")
+    private Dessert dessert;
+
+    @Column(nullable = false, length = 100)
+    private String description;
+
+    @Column(nullable = false)
+    private Integer price;
+
+    @Builder
+    public Option(Dessert dessert, String description, Integer price) {
+        this.dessert = dessert;
+        this.description = description;
+        this.price = price;
+    }
+}
diff --git a/src/main/java/com/codepatissier/keki/dessert/repository/DessertRepository.java b/src/main/java/com/codepatissier/keki/dessert/repository/DessertRepository.java
index 57f688b..ea69b03 100644
--- a/src/main/java/com/codepatissier/keki/dessert/repository/DessertRepository.java
+++ b/src/main/java/com/codepatissier/keki/dessert/repository/DessertRepository.java
@@ -17,5 +17,6 @@ public interface DessertRepository extends JpaRepository<Dessert, Long> {
     Page<Dessert> findByStoreAndStatusAndDessertIdxLessThanOrderByDessertIdxDesc(Store store, String activeStatus, Long cursorIdx, Pageable page);
     boolean existsByStatusAndDessertIdxLessThan(String activeStatus, Long dessertIdx);
     Optional<Dessert> findByDessertIdxAndStatus(Long dessertIdx, String activeStatus);
+    void deleteByStore(Store store);
 }
 
diff --git a/src/main/java/com/codepatissier/keki/dessert/repository/OptionRepository.java b/src/main/java/com/codepatissier/keki/dessert/repository/OptionRepository.java
new file mode 100644
index 0000000..af47ef7
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/dessert/repository/OptionRepository.java
@@ -0,0 +1,13 @@
+package com.codepatissier.keki.dessert.repository;
+
+import com.codepatissier.keki.dessert.entity.Dessert;
+import com.codepatissier.keki.dessert.entity.Option;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface OptionRepository extends JpaRepository<Option, Long> {
+    List<Option> findByDessertAndStatusOrderByOptionIdx(Dessert dessert, String activeStatus);
+}
diff --git a/src/main/java/com/codepatissier/keki/dessert/service/DessertService.java b/src/main/java/com/codepatissier/keki/dessert/service/DessertService.java
index ba3df3b..db73244 100644
--- a/src/main/java/com/codepatissier/keki/dessert/service/DessertService.java
+++ b/src/main/java/com/codepatissier/keki/dessert/service/DessertService.java
@@ -1,11 +1,12 @@
 package com.codepatissier.keki.dessert.service;
 
 import com.codepatissier.keki.common.BaseException;
-import com.codepatissier.keki.common.Constant;
 import com.codepatissier.keki.common.Role;
 import com.codepatissier.keki.dessert.dto.*;
 import com.codepatissier.keki.dessert.entity.Dessert;
+import com.codepatissier.keki.dessert.entity.Option;
 import com.codepatissier.keki.dessert.repository.DessertRepository;
+import com.codepatissier.keki.dessert.repository.OptionRepository;
 import com.codepatissier.keki.post.entity.PostImg;
 import com.codepatissier.keki.post.repository.PostRepository;
 import com.codepatissier.keki.store.entity.Store;
@@ -15,12 +16,14 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import static com.codepatissier.keki.common.BaseResponseStatus.*;
-import static com.codepatissier.keki.common.Constant.INACTIVE_STATUS;
+import static com.codepatissier.keki.common.Constant.ACTIVE_STATUS;
 
 @Service
 @RequiredArgsConstructor
@@ -29,13 +32,14 @@ public class DessertService {
     private final StoreRepository storeRepository;
     private final PostRepository postRepository;
     private final UserRepository userRepository;
+    private final OptionRepository optionRepository;
 
     /**
      * 상품 전체 조회
      */
     public GetStoreDessertsRes getDessertList(Long storeIdx, Long cursorIdx, Integer size) throws BaseException {
         try {
-            Store store = storeRepository.findByStoreIdxAndStatus(storeIdx, Constant.ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_STORE_IDX));
+            Store store = storeRepository.findByStoreIdxAndStatus(storeIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_STORE_IDX));
 
             List<GetStoreDessertsRes.Dessert> dessertList = cursorIdx == null ?
                     getDessertList(store, size) :
@@ -52,15 +56,15 @@ public GetStoreDessertsRes getDessertList(Long storeIdx, Long cursorIdx, Integer
     }
 
     private List<GetStoreDessertsRes.Dessert> getDessertList(Store store, Integer size) {
-            return dessertRepository.findByStoreAndStatusOrderByDessertIdxDesc(store, Constant.ACTIVE_STATUS, PageRequest.of(0, size)).stream()
+            return dessertRepository.findByStoreAndStatusOrderByDessertIdxDesc(store, ACTIVE_STATUS, PageRequest.of(0, size)).stream()
                     .map(dessert -> new GetStoreDessertsRes.Dessert(dessert.getDessertIdx(),
                             dessert.getDessertImg(), dessert.getDessertName())).collect(Collectors.toList());
     }
 
     private List<GetStoreDessertsRes.Dessert> getDessertListWithCursor(Store store, Long cursorIdx, Integer size) throws BaseException {
-        dessertRepository.findByDessertIdxAndStatus(cursorIdx, Constant.ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_DESSERT_IDX));
+        dessertRepository.findByDessertIdxAndStatus(cursorIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_DESSERT_IDX));
 
-        return dessertRepository.findByStoreAndStatusAndDessertIdxLessThanOrderByDessertIdxDesc(store, Constant.ACTIVE_STATUS, cursorIdx, PageRequest.of(0, size)).stream()
+        return dessertRepository.findByStoreAndStatusAndDessertIdxLessThanOrderByDessertIdxDesc(store, ACTIVE_STATUS, cursorIdx, PageRequest.of(0, size)).stream()
                 .map(dessert -> new GetStoreDessertsRes.Dessert(dessert.getDessertIdx(),
                         dessert.getDessertImg(), dessert.getDessertName())).collect(Collectors.toList());
     }
@@ -70,7 +74,7 @@ private static Long getLastIdxOfList(List<GetStoreDessertsRes.Dessert> dessertLi
     }
 
     private Boolean hasNext(Long lastIdx) {
-        return lastIdx != null && this.dessertRepository.existsByStatusAndDessertIdxLessThan(Constant.ACTIVE_STATUS, lastIdx);
+        return lastIdx != null && this.dessertRepository.existsByStatusAndDessertIdxLessThan(ACTIVE_STATUS, lastIdx);
     }
 
     /**
@@ -78,11 +82,14 @@ private Boolean hasNext(Long lastIdx) {
      */
     public GetDessertRes getDessert(Long dessertIdx) throws BaseException {
         try {
-            Dessert dessert = dessertRepository.findByDessertIdxAndStatus(dessertIdx, Constant.ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_DESSERT_IDX));
+            Dessert dessert = dessertRepository.findByDessertIdxAndStatus(dessertIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_DESSERT_IDX));
 
-            List<GetDessertRes.Image> imgList = getPostImgList(dessert);
+            ArrayList<GetDessertRes.Image> imgList = new ArrayList<>();
+            imgList.add(getDessertImg(dessert));
+            ArrayList<GetDessertRes.Image> postImgList = getPostImgList(dessert);
+            imgList.addAll(postImgList);
 
-            // nickname, dessertName, dessertPrice, dessertDescription, imgList
+            // nickname, dessertName, dessertPrice, dessertDescription, imgList(상품 상세 이미지 1장+피드 이미지 4장)
             return new GetDessertRes(dessert.getStore().getUser().getNickname(), dessert.getDessertName(), dessert.getDessertPrice(), dessert.getDessertDescription(), imgList);
         } catch (BaseException e) {
             throw e;
@@ -91,9 +98,13 @@ public GetDessertRes getDessert(Long dessertIdx) throws BaseException {
         }
     }
 
-    // 특정 dessert가 들어간 post 5개를 가져와 postIdx와 대표 postImg를 반환
-    private List<GetDessertRes.Image> getPostImgList(Dessert dessert) {
-        return postRepository.findTop5ByDessertAndStatusOrderByPostIdxDesc(dessert, Constant.ACTIVE_STATUS).stream()
+    private GetDessertRes.Image getDessertImg(Dessert dessert) {
+        return new GetDessertRes.Image(dessert.getDessertIdx(), dessert.getDessertImg());
+    }
+
+    // 특정 dessert가 들어간 post 4개를 가져와 postIdx와 대표 postImg를 반환
+    private ArrayList<GetDessertRes.Image> getPostImgList(Dessert dessert) {
+        return (ArrayList<GetDessertRes.Image>) postRepository.findTop4ByDessertAndStatusOrderByPostIdxDesc(dessert, ACTIVE_STATUS).stream()
                 .map(posts -> new GetDessertRes.Image(posts.getPostIdx(),
                         representPostImgUrl(posts.getImages()))).collect(Collectors.toList());
     }
@@ -102,16 +113,22 @@ private String representPostImgUrl(List<PostImg> postImages){
         return postImages.isEmpty() ? null : postImages.get(0).getImgUrl();
     }
 
+//    private List<GetDessertRes.Option> getOptionList(Dessert dessert) {
+//        return optionRepository.findByDessertAndStatusOrderByOptionIdx(dessert, ACTIVE_STATUS).stream()
+//                .map(option -> new GetDessertRes.Option(option.getDescription(), option.getPrice())).collect(Collectors.toList());
+//    }
+
     /**
      * [판매자] 상품 등록
      * 상품 이름, 가격, 소개, 이미지(1장)
      */
+    @Transactional(rollbackFor = Exception.class)
     public void addDessert(Long userIdx, PostDessertReq postDessertReq) throws BaseException {
         try {
-            User user = userRepository.findByUserIdxAndStatusEquals(userIdx, Constant.ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+            User user = userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
             if (!Role.getRoleByName(user.getRole()).equals(Role.STORE)) throw new BaseException(NO_STORE_ROLE);
 
-            Store store = storeRepository.findByUserAndStatus(user, Constant.ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_STORE_IDX));
+            Store store = storeRepository.findByUserAndStatus(user, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_STORE_IDX));
 
             Dessert dessert = Dessert.builder()
                     .store(store)
@@ -121,6 +138,7 @@ public void addDessert(Long userIdx, PostDessertReq postDessertReq) throws BaseE
                     .dessertImg(postDessertReq.getDessertImg())
                     .build();
             dessertRepository.save(dessert);
+
         } catch (BaseException e) {
             throw e;
         } catch (Exception e) {
@@ -134,9 +152,8 @@ public void addDessert(Long userIdx, PostDessertReq postDessertReq) throws BaseE
     public void deleteDessert(Long userIdx, Long dessertIdx) throws BaseException {
         try {
             checkStore(userIdx);
-            Dessert dessert = dessertRepository.findByDessertIdxAndStatus(dessertIdx, Constant.ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_DESSERT_IDX));
-            dessert.setStatus(INACTIVE_STATUS);
-            dessertRepository.save(dessert);
+            dessertRepository.findByDessertIdxAndStatus(dessertIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(DELETED_DESSERT));
+            dessertRepository.deleteById(dessertIdx);
         } catch (BaseException e) {
             throw e;
         } catch (Exception e) {
@@ -151,7 +168,7 @@ public void deleteDessert(Long userIdx, Long dessertIdx) throws BaseException {
     public void modifyDessert(PatchDessertReq patchDessertReq, Long dessertIdx, Long userIdx) throws BaseException {
         try {
             checkStore(userIdx);
-            Dessert dessert = dessertRepository.findByDessertIdxAndStatus(dessertIdx, Constant.ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_DESSERT_IDX));
+            Dessert dessert = dessertRepository.findByDessertIdxAndStatus(dessertIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_DESSERT_IDX));
 
             if (patchDessertReq.getDessertImg() != null) {
                 if (!patchDessertReq.getDessertImg().equals("") && !patchDessertReq.getDessertImg().equals(" "))
@@ -191,7 +208,7 @@ public void modifyDessert(PatchDessertReq patchDessertReq, Long dessertIdx, Long
     public GetStoreDessertRes getStoreDessert(Long userIdx, Long dessertIdx) throws BaseException {
         try {
             checkStore(userIdx);
-            Dessert dessert = dessertRepository.findByDessertIdxAndStatus(dessertIdx, Constant.ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_DESSERT_IDX));
+            Dessert dessert = dessertRepository.findByDessertIdxAndStatus(dessertIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_DESSERT_IDX));
 
             return new GetStoreDessertRes(dessert.getStore().getUser().getNickname(), dessert.getDessertImg(), dessert.getDessertName(), dessert.getDessertPrice(), dessert.getDessertDescription());
         } catch (BaseException e) {
@@ -203,7 +220,7 @@ public GetStoreDessertRes getStoreDessert(Long userIdx, Long dessertIdx) throws
 
     private void checkStore(Long userIdx) throws BaseException {
         try {
-            User user = userRepository.findByUserIdxAndStatusEquals(userIdx, Constant.ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+            User user = userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
             if (!Role.getRoleByName(user.getRole()).equals(Role.STORE)) throw new BaseException(NO_STORE_ROLE);
         } catch (BaseException e) {
             throw e;
diff --git a/src/main/java/com/codepatissier/keki/history/controller/HistoryController.java b/src/main/java/com/codepatissier/keki/history/controller/HistoryController.java
index 370670e..8254ead 100644
--- a/src/main/java/com/codepatissier/keki/history/controller/HistoryController.java
+++ b/src/main/java/com/codepatissier/keki/history/controller/HistoryController.java
@@ -15,7 +15,6 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Constraint;
 import java.util.List;
 
 @SecurityRequirement(name = "Bearer")
@@ -53,7 +52,7 @@ public BaseResponse<List<PostSearchRes>> recentSearchCake(){
 
     // 최근 검색어 삭제
     @ResponseBody
-    @PatchMapping("")
+    @DeleteMapping("")
     public BaseResponse<String> deleteRecentHistories(){
         try{
             this.searchHistoryService.deleteRecentHistories(this.authService.getUserIdx());
diff --git a/src/main/java/com/codepatissier/keki/history/entity/PostHistory.java b/src/main/java/com/codepatissier/keki/history/entity/PostHistory.java
index 3b2ccfc..5a04a5b 100644
--- a/src/main/java/com/codepatissier/keki/history/entity/PostHistory.java
+++ b/src/main/java/com/codepatissier/keki/history/entity/PostHistory.java
@@ -7,6 +7,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.SQLDelete;
 
 import javax.persistence.*;
 
@@ -14,16 +15,17 @@
 @NoArgsConstructor
 @DynamicInsert
 @Getter
+@SQLDelete(sql = "UPDATE post_history SET status = 'inactive', last_modified_date = current_timestamp WHERE post_history_idx = ?")
 public class PostHistory extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long postHistoryIdx;
 
-    @OneToOne
+    @ManyToOne
     @JoinColumn(nullable = false, name = "userIdx")
     private User user;
 
-    @OneToOne
+    @ManyToOne
     @JoinColumn(nullable = false, name = "postIdx")
     private Post post;
 
diff --git a/src/main/java/com/codepatissier/keki/history/entity/SearchHistory.java b/src/main/java/com/codepatissier/keki/history/entity/SearchHistory.java
index 8ac4b93..5f39b71 100644
--- a/src/main/java/com/codepatissier/keki/history/entity/SearchHistory.java
+++ b/src/main/java/com/codepatissier/keki/history/entity/SearchHistory.java
@@ -6,6 +6,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.SQLDelete;
 
 import javax.persistence.*;
 
@@ -13,13 +14,14 @@
 @NoArgsConstructor
 @DynamicInsert
 @Getter
+@SQLDelete(sql = "UPDATE search_history SET status = 'inactive', last_modified_date = current_timestamp WHERE search_history_idx = ?")
 public class SearchHistory extends BaseEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long searchHistoryIdx;
 
-    @OneToOne
+    @ManyToOne
     @JoinColumn(nullable = false, name = "userIdx")
     private User user;
 
diff --git a/src/main/java/com/codepatissier/keki/history/repository/PostHistoryRepository.java b/src/main/java/com/codepatissier/keki/history/repository/PostHistoryRepository.java
index f1e99ef..51d6d8d 100644
--- a/src/main/java/com/codepatissier/keki/history/repository/PostHistoryRepository.java
+++ b/src/main/java/com/codepatissier/keki/history/repository/PostHistoryRepository.java
@@ -1,10 +1,18 @@
 package com.codepatissier.keki.history.repository;
 
 import com.codepatissier.keki.history.entity.PostHistory;
+import com.codepatissier.keki.post.entity.Post;
+import com.codepatissier.keki.user.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface PostHistoryRepository extends JpaRepository<PostHistory, Long>, PostHistoryCustom{
     int countByPostPostIdxEquals(Long postIdx);
-}
+    void deleteByPost(Post post);
+    void deleteByUser(User user);
+
+    List<PostHistory> findByUserAndStatus(User user, String status);
+}
\ No newline at end of file
diff --git a/src/main/java/com/codepatissier/keki/history/repository/SearchHistoryRepository.java b/src/main/java/com/codepatissier/keki/history/repository/SearchHistoryRepository.java
index 17799f6..dd83bb6 100644
--- a/src/main/java/com/codepatissier/keki/history/repository/SearchHistoryRepository.java
+++ b/src/main/java/com/codepatissier/keki/history/repository/SearchHistoryRepository.java
@@ -10,4 +10,6 @@
 @Repository
 public interface SearchHistoryRepository extends JpaRepository<SearchHistory, Long>, SearchHistoryCustom {
     List<SearchHistory> findByUserAndStatus(User user, String activeStatus);
+
+    void deleteByUser(User user);
 }
diff --git a/src/main/java/com/codepatissier/keki/history/service/SearchHistoryService.java b/src/main/java/com/codepatissier/keki/history/service/SearchHistoryService.java
index 4ffbe39..e6b6465 100644
--- a/src/main/java/com/codepatissier/keki/history/service/SearchHistoryService.java
+++ b/src/main/java/com/codepatissier/keki/history/service/SearchHistoryService.java
@@ -14,7 +14,6 @@
 import java.util.stream.Collectors;
 
 import static com.codepatissier.keki.common.Constant.ACTIVE_STATUS;
-import static com.codepatissier.keki.common.Constant.INACTIVE_STATUS;
 
 @Service
 @RequiredArgsConstructor
@@ -39,11 +38,7 @@ public void deleteRecentHistories(Long userIdx) throws BaseException {
         try{
             User user = this.userRepository.findById(userIdx)
                     .orElseThrow(() -> new BaseException(BaseResponseStatus.INVALID_USER_IDX));
-            this.searchHistoryRepository.findByUserAndStatus(user, ACTIVE_STATUS).stream()
-                    .forEach(searches -> {
-                        searches.setStatus(INACTIVE_STATUS);
-                        this.searchHistoryRepository.save(searches);
-                    });
+            this.searchHistoryRepository.deleteAll(this.searchHistoryRepository.findByUserAndStatus(user, ACTIVE_STATUS));
         }catch (Exception e){
             throw new BaseException(BaseResponseStatus.DATABASE_ERROR);
         }
diff --git a/src/main/java/com/codepatissier/keki/order/controller/OrderController.java b/src/main/java/com/codepatissier/keki/order/controller/OrderController.java
new file mode 100644
index 0000000..2c413c5
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/controller/OrderController.java
@@ -0,0 +1,15 @@
+package com.codepatissier.keki.order.controller;
+
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@SecurityRequirement(name = "Bearer")
+@Tag(name = "orders", description = "주문 API")
+@RestController
+@RequestMapping(value = "/orders")
+@RequiredArgsConstructor
+public class OrderController {
+}
diff --git a/src/main/java/com/codepatissier/keki/order/entity/OptionOrder.java b/src/main/java/com/codepatissier/keki/order/entity/OptionOrder.java
new file mode 100644
index 0000000..3defbb2
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/entity/OptionOrder.java
@@ -0,0 +1,26 @@
+package com.codepatissier.keki.order.entity;
+
+import com.codepatissier.keki.dessert.entity.Option;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+
+import javax.persistence.*;
+
+@Getter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+public class OptionOrder {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long optionOrderIdx;
+
+    @ManyToOne
+    @JoinColumn(nullable = false, name = "orderIdx")
+    private Order order;
+
+    @ManyToOne
+    @JoinColumn(nullable = false, name = "optionIdx")
+    private Option option;
+}
diff --git a/src/main/java/com/codepatissier/keki/order/entity/Order.java b/src/main/java/com/codepatissier/keki/order/entity/Order.java
new file mode 100644
index 0000000..86402fb
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/entity/Order.java
@@ -0,0 +1,79 @@
+package com.codepatissier.keki.order.entity;
+
+import com.codepatissier.keki.dessert.entity.Dessert;
+import com.codepatissier.keki.store.entity.Store;
+import com.codepatissier.keki.user.entity.User;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Table(name = "orders")
+@Getter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+public class Order {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long orderIdx;
+
+    @ManyToOne
+    @JoinColumn(nullable = false, name = "userIdx")
+    private User user;
+
+    @ManyToOne
+    @JoinColumn(nullable = false, name = "storeIdx")
+    private Store store;
+
+    @ManyToOne
+    @JoinColumn(nullable = false, name = "dessertIdx")
+    private Dessert dessert;
+
+    @Column(nullable = false)
+    private LocalDateTime pickupDate;
+
+    @Column(nullable = false, length = 30)
+    private String customerName;
+
+    @Column(nullable = false, length = 20)
+    private String customerPhone;
+
+    @Enumerated(EnumType.STRING)
+    @Column(columnDefinition = "varchar(20) default 'ORDER_WAITING'")
+    private OrderStatus orderStatus;
+
+    @Column(nullable = false)
+    private int extraPrice;
+
+    @Column(nullable = false)
+    private int totalPrice;
+
+    @Column(nullable = false, length = 500)
+    private String request;
+
+    @OneToMany(fetch = FetchType.EAGER, mappedBy = "order", orphanRemoval = true)
+    private List<OptionOrder> options = new ArrayList<>();
+
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "order", orphanRemoval = true)
+    private List<OrderImg> imgs = new ArrayList<>();
+
+    @Builder
+    public Order(User user, Store store, Dessert dessert, LocalDateTime pickupDate, String customerName, String customerPhone, int extraPrice, int totalPrice, String request) {
+        this.user = user;
+        this.store = store;
+        this.dessert = dessert;
+        this.pickupDate = pickupDate;
+        this.customerName = customerName;
+        this.customerPhone = customerPhone;
+        this.extraPrice = extraPrice;
+        this.totalPrice = totalPrice;
+        this.request = request;
+    }
+
+}
diff --git a/src/main/java/com/codepatissier/keki/order/entity/OrderImg.java b/src/main/java/com/codepatissier/keki/order/entity/OrderImg.java
new file mode 100644
index 0000000..8885ee7
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/entity/OrderImg.java
@@ -0,0 +1,24 @@
+package com.codepatissier.keki.order.entity;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+
+import javax.persistence.*;
+
+@Getter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+public class OrderImg {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long orderImgIdx;
+
+    @ManyToOne
+    @JoinColumn(nullable = false, name = "orderIdx")
+    private Order order;
+
+    @Column(nullable = false, length = 300)
+    private String imgUrl;
+}
diff --git a/src/main/java/com/codepatissier/keki/order/entity/OrderStatus.java b/src/main/java/com/codepatissier/keki/order/entity/OrderStatus.java
new file mode 100644
index 0000000..9337a31
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/entity/OrderStatus.java
@@ -0,0 +1,27 @@
+package com.codepatissier.keki.order.entity;
+
+import lombok.Getter;
+
+import java.util.Arrays;
+
+@Getter
+public enum OrderStatus {
+    ORDER_WAITING(1, "주문대기"),
+    PROGRESSING(2, "제작중"),
+    PICKUP_WAITING(3, "픽업대기"),
+    COMPLETED(4, "픽업완료"),
+    CANCELED(5, "주문취소");
+
+    private int number;
+    private String name;
+    OrderStatus(int number, String name){
+        this.number = number;
+        this.name = name;
+    }
+
+    public static OrderStatus getOrderStatusByName(String name){
+        return Arrays.stream(OrderStatus.values())
+                .filter(r -> r.getName().equals(name))
+                .findAny().orElse(null);
+    }
+}
diff --git a/src/main/java/com/codepatissier/keki/order/repository/OrderRepository.java b/src/main/java/com/codepatissier/keki/order/repository/OrderRepository.java
new file mode 100644
index 0000000..4c204a5
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/repository/OrderRepository.java
@@ -0,0 +1,9 @@
+package com.codepatissier.keki.order.repository;
+
+import com.codepatissier.keki.order.entity.Order;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface OrderRepository extends JpaRepository<Order, Long> {
+}
diff --git a/src/main/java/com/codepatissier/keki/order/service/OrderService.java b/src/main/java/com/codepatissier/keki/order/service/OrderService.java
new file mode 100644
index 0000000..e5fccfb
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/order/service/OrderService.java
@@ -0,0 +1,9 @@
+package com.codepatissier.keki.order.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class OrderService {
+}
diff --git a/src/main/java/com/codepatissier/keki/post/controller/PostController.java b/src/main/java/com/codepatissier/keki/post/controller/PostController.java
index fee78e6..a1c6db5 100644
--- a/src/main/java/com/codepatissier/keki/post/controller/PostController.java
+++ b/src/main/java/com/codepatissier/keki/post/controller/PostController.java
@@ -51,7 +51,7 @@ public BaseResponse<GetPostsRes> getPosts(@RequestParam(required = false) Long s
                 return new BaseResponse<>(MANY_PARAMETER);
             if(sortType != null && storeIdx != null) return new BaseResponse<>(DO_NOT_STORE_SORT_TYPE);
             if(sortType == null) sortType = NEW_SORT_TYPE;
-            if(cursorIdx != null){
+            if(cursorIdx != null && !sortType.equals(NEW_SORT_TYPE)){
                 if (cursorPrice == null && cursorPopularNum == null) return new BaseResponse<>(NULL_CURSOR);
                 if ((sortType.equals(LOW_PRICE_SORT_TYPE) && cursorPrice == null) ||
                         (sortType.equals(POPULAR_SORT_TYPE) && cursorPopularNum == null))
@@ -205,10 +205,10 @@ public BaseResponse<GetModifyPostRes> getModifyPostView(@PathVariable Long postI
 
     /**
      * 게시물 수정
-     * [PATCH] /posts/:postIdx/edit
+     * [PATCH] /posts/:postIdx
      */
     @ResponseBody
-    @PatchMapping("/{postIdx}/edit")
+    @PatchMapping("/{postIdx}")
     public BaseResponse<String> modifyPost(@RequestBody PatchPostReq patchPostReq, @PathVariable Long postIdx){
         try{
             if (patchPostReq.getPostImgUrls() != null && (patchPostReq.getPostImgUrls().size() > 5 || patchPostReq.getPostImgUrls().size() < 1))
@@ -224,10 +224,10 @@ public BaseResponse<String> modifyPost(@RequestBody PatchPostReq patchPostReq, @
 
     /**
      * 게시물 삭제
-     * [PATCH] /posts/:postIdx
+     * [DELETE] /posts/:postIdx
      */
     @ResponseBody
-    @PatchMapping("/{postIdx}")
+    @DeleteMapping("/{postIdx}")
     public BaseResponse<String> deletePost(@PathVariable Long postIdx){
         try{
             this.postService.deletePost(authService.getUserIdx(), postIdx);
diff --git a/src/main/java/com/codepatissier/keki/post/dto/GetPostRes.java b/src/main/java/com/codepatissier/keki/post/dto/GetPostRes.java
index a25afe8..ad7ed57 100644
--- a/src/main/java/com/codepatissier/keki/post/dto/GetPostRes.java
+++ b/src/main/java/com/codepatissier/keki/post/dto/GetPostRes.java
@@ -16,6 +16,7 @@
 @NoArgsConstructor
 public class GetPostRes {
     private Long postIdx;
+    private Long dessertIdx;
     private String dessertName;
     private int dessertPrice;
     private String description;
@@ -28,6 +29,7 @@ public class GetPostRes {
 
     public GetPostRes(Post post, boolean like){
         this.postIdx = post.getPostIdx();
+        this.dessertIdx = post.getDessert().getDessertIdx();
         this.dessertName = post.getDessert().getDessertName();
         this.dessertPrice = post.getDessert().getDessertPrice();
         this.description = post.getPostDescription();
diff --git a/src/main/java/com/codepatissier/keki/post/entity/Post.java b/src/main/java/com/codepatissier/keki/post/entity/Post.java
index e781e45..7ea8a41 100644
--- a/src/main/java/com/codepatissier/keki/post/entity/Post.java
+++ b/src/main/java/com/codepatissier/keki/post/entity/Post.java
@@ -1,12 +1,14 @@
 package com.codepatissier.keki.post.entity;
 
 import com.codepatissier.keki.common.BaseEntity;
+import com.codepatissier.keki.common.entityListener.PostEntityListener;
 import com.codepatissier.keki.dessert.entity.Dessert;
 import com.codepatissier.keki.store.entity.Store;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.SQLDelete;
 
 import javax.persistence.*;
 import java.util.ArrayList;
@@ -16,6 +18,8 @@
 @Entity
 @NoArgsConstructor
 @DynamicInsert
+@SQLDelete(sql = "UPDATE post SET status = 'inactive', last_modified_date = current_timestamp WHERE post_idx = ?")
+@EntityListeners(PostEntityListener.class)
 public class Post extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/codepatissier/keki/post/entity/PostImg.java b/src/main/java/com/codepatissier/keki/post/entity/PostImg.java
index 9e8e690..c75f151 100644
--- a/src/main/java/com/codepatissier/keki/post/entity/PostImg.java
+++ b/src/main/java/com/codepatissier/keki/post/entity/PostImg.java
@@ -5,6 +5,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.SQLDelete;
 
 import javax.persistence.*;
 
@@ -12,6 +13,7 @@
 @Entity
 @NoArgsConstructor
 @DynamicInsert
+@SQLDelete(sql = "UPDATE post_img SET status = 'inactive', last_modified_date = current_timestamp WHERE post_img_idx = ?")
 public class PostImg extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/codepatissier/keki/post/entity/PostLike.java b/src/main/java/com/codepatissier/keki/post/entity/PostLike.java
index b2dba92..3f57251 100644
--- a/src/main/java/com/codepatissier/keki/post/entity/PostLike.java
+++ b/src/main/java/com/codepatissier/keki/post/entity/PostLike.java
@@ -6,6 +6,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.SQLDelete;
 
 import javax.persistence.*;
 
@@ -13,6 +14,7 @@
 @Entity
 @NoArgsConstructor
 @DynamicInsert
+@SQLDelete(sql = "UPDATE post_like SET status = 'inactive', last_modified_date = current_timestamp WHERE post_like_idx = ?")
 public class PostLike extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/codepatissier/keki/post/entity/PostTag.java b/src/main/java/com/codepatissier/keki/post/entity/PostTag.java
index d37ced1..fa4b8a7 100644
--- a/src/main/java/com/codepatissier/keki/post/entity/PostTag.java
+++ b/src/main/java/com/codepatissier/keki/post/entity/PostTag.java
@@ -1,11 +1,12 @@
 package com.codepatissier.keki.post.entity;
 
 import com.codepatissier.keki.common.BaseEntity;
-import com.codepatissier.keki.common.Tag.Tag;
+import com.codepatissier.keki.common.tag.Tag;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.SQLDelete;
 
 import javax.persistence.*;
 
@@ -13,6 +14,7 @@
 @Entity
 @NoArgsConstructor
 @DynamicInsert
+@SQLDelete(sql = "UPDATE post_tag SET status = 'inactive', last_modified_date = current_timestamp WHERE post_tag_idx = ?")
 public class PostTag extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/codepatissier/keki/post/repository/PostLikeRepository.java b/src/main/java/com/codepatissier/keki/post/repository/PostLikeRepository.java
index 8a4dbc3..807fad3 100644
--- a/src/main/java/com/codepatissier/keki/post/repository/PostLikeRepository.java
+++ b/src/main/java/com/codepatissier/keki/post/repository/PostLikeRepository.java
@@ -17,4 +17,7 @@ public interface PostLikeRepository extends JpaRepository<PostLike, Long> {
     List<PostLike> findByUserAndStatusAndLastModifiedDateLessThanOrderByLastModifiedDateDesc(User user, String status, LocalDateTime lastModifiedDate, Pageable page);
     boolean existsByPostAndUserAndStatus(Post post, User user, String status);
     boolean existsByUserAndStatusAndLastModifiedDateLessThan(User user, String status, LocalDateTime lastDate);
+
+    void deleteByPost(Post post);
+    void deleteByUser(User user);
 }
diff --git a/src/main/java/com/codepatissier/keki/post/repository/PostRepository.java b/src/main/java/com/codepatissier/keki/post/repository/PostRepository.java
index f1a6d06..9bb3198 100644
--- a/src/main/java/com/codepatissier/keki/post/repository/PostRepository.java
+++ b/src/main/java/com/codepatissier/keki/post/repository/PostRepository.java
@@ -7,6 +7,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Repository
@@ -21,5 +22,7 @@ public interface PostRepository extends JpaRepository<Post, Long>, PostCustom {
 
     boolean existsByStoreAndStatusAndPostIdxLessThan(Store store, String status, Long postIdx);
     boolean existsByDessertDessertNameContainingAndStatusAndPostIdxLessThan(String word, String status, Long postIdx);
-    List<Post> findTop5ByDessertAndStatusOrderByPostIdxDesc(Dessert dessert, String activeStatus);
+    ArrayList<Post> findTop4ByDessertAndStatusOrderByPostIdxDesc(Dessert dessert, String activeStatus);
+
+    void deleteByDessert(Dessert dessert);
 }
\ No newline at end of file
diff --git a/src/main/java/com/codepatissier/keki/post/repository/PostTagCustom.java b/src/main/java/com/codepatissier/keki/post/repository/PostTagCustom.java
index cc89c5f..b14c774 100644
--- a/src/main/java/com/codepatissier/keki/post/repository/PostTagCustom.java
+++ b/src/main/java/com/codepatissier/keki/post/repository/PostTagCustom.java
@@ -1,6 +1,6 @@
 package com.codepatissier.keki.post.repository;
 
-import com.codepatissier.keki.common.Tag.Tag;
+import com.codepatissier.keki.common.tag.Tag;
 import com.codepatissier.keki.post.entity.Post;
 import org.springframework.data.domain.Pageable;
 
diff --git a/src/main/java/com/codepatissier/keki/post/repository/PostTagRepository.java b/src/main/java/com/codepatissier/keki/post/repository/PostTagRepository.java
index 2947c6f..7698fc9 100644
--- a/src/main/java/com/codepatissier/keki/post/repository/PostTagRepository.java
+++ b/src/main/java/com/codepatissier/keki/post/repository/PostTagRepository.java
@@ -1,6 +1,6 @@
 package com.codepatissier.keki.post.repository;
 
-import com.codepatissier.keki.common.Tag.Tag;
+import com.codepatissier.keki.common.tag.Tag;
 import com.codepatissier.keki.post.entity.Post;
 import com.codepatissier.keki.post.entity.PostTag;
 import org.springframework.data.domain.Pageable;
diff --git a/src/main/java/com/codepatissier/keki/post/repository/PostTagRepositoryImpl.java b/src/main/java/com/codepatissier/keki/post/repository/PostTagRepositoryImpl.java
index 0e5304e..e59df33 100644
--- a/src/main/java/com/codepatissier/keki/post/repository/PostTagRepositoryImpl.java
+++ b/src/main/java/com/codepatissier/keki/post/repository/PostTagRepositoryImpl.java
@@ -1,6 +1,6 @@
 package com.codepatissier.keki.post.repository;
 
-import com.codepatissier.keki.common.Tag.Tag;
+import com.codepatissier.keki.common.tag.Tag;
 import com.codepatissier.keki.post.entity.Post;
 import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
diff --git a/src/main/java/com/codepatissier/keki/post/service/PostService.java b/src/main/java/com/codepatissier/keki/post/service/PostService.java
index 75ef8b5..1fbaefc 100644
--- a/src/main/java/com/codepatissier/keki/post/service/PostService.java
+++ b/src/main/java/com/codepatissier/keki/post/service/PostService.java
@@ -1,11 +1,10 @@
 package com.codepatissier.keki.post.service;
 
-import com.codepatissier.keki.calendar.dto.TagRes;
 import com.codepatissier.keki.common.BaseException;
 import com.codepatissier.keki.common.Constant;
 import com.codepatissier.keki.common.Role;
-import com.codepatissier.keki.common.Tag.Tag;
-import com.codepatissier.keki.common.Tag.TagRepository;
+import com.codepatissier.keki.common.tag.Tag;
+import com.codepatissier.keki.common.tag.TagRepository;
 import com.codepatissier.keki.dessert.entity.Dessert;
 import com.codepatissier.keki.dessert.repository.DessertRepository;
 import com.codepatissier.keki.history.entity.PostHistory;
@@ -153,9 +152,10 @@ public void deletePost(Long userIdx, Long postIdx) throws BaseException {
             if(!user.getUserIdx().equals(post.getStore().getUser().getUserIdx()))
                 throw new BaseException(NO_MATCH_POST_STORE);
 
-            post.setStatus(INACTIVE_STATUS);
-
-            this.postRepository.save(post);
+            this.postRepository.deleteById(postIdx);
+//            post.setStatus(INACTIVE_STATUS);
+//
+//            this.postRepository.save(post);
         } catch (BaseException e) {
             throw e;
         } catch (Exception e){
diff --git a/src/main/java/com/codepatissier/keki/store/entity/Store.java b/src/main/java/com/codepatissier/keki/store/entity/Store.java
index 7e0ec68..9407424 100644
--- a/src/main/java/com/codepatissier/keki/store/entity/Store.java
+++ b/src/main/java/com/codepatissier/keki/store/entity/Store.java
@@ -1,11 +1,13 @@
 package com.codepatissier.keki.store.entity;
 
 import com.codepatissier.keki.common.BaseEntity;
+import com.codepatissier.keki.common.entityListener.StoreEntityListener;
 import com.codepatissier.keki.user.entity.User;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.SQLDelete;
 
 import javax.persistence.*;
 
@@ -13,6 +15,8 @@
 @Entity
 @NoArgsConstructor
 @DynamicInsert
+@SQLDelete(sql = "UPDATE store SET status = 'inactive', last_modified_date = current_timestamp WHERE store_idx = ?")
+@EntityListeners(StoreEntityListener.class)
 public class Store extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/codepatissier/keki/store/repository/StoreRepository.java b/src/main/java/com/codepatissier/keki/store/repository/StoreRepository.java
index 8d79dd9..fc655e1 100644
--- a/src/main/java/com/codepatissier/keki/store/repository/StoreRepository.java
+++ b/src/main/java/com/codepatissier/keki/store/repository/StoreRepository.java
@@ -12,4 +12,6 @@ public interface StoreRepository extends JpaRepository<Store, Long> {
     Optional<Store> findByUser(User user); // TODO PostService에서 findByUserAndStatus로 변경 후 삭제
     Optional<Store> findByUserAndStatus(User user, String activeStatus);
     Optional<Store> findByStoreIdxAndStatus(Long storeIdx, String activeStatus);
+
+    void deleteByUser(User user);
 }
\ No newline at end of file
diff --git a/src/main/java/com/codepatissier/keki/store/service/StoreService.java b/src/main/java/com/codepatissier/keki/store/service/StoreService.java
index 3cef9e3..67d72bc 100644
--- a/src/main/java/com/codepatissier/keki/store/service/StoreService.java
+++ b/src/main/java/com/codepatissier/keki/store/service/StoreService.java
@@ -31,7 +31,7 @@ public PostStoreRes signUpStore(Long userIdx, PostStoreReq postStoreReq) throws
             String refreshToken = authService.createRefreshToken(userIdx);
 
             User user = userRepository.findByUserIdxAndStatusEquals(userIdx, Constant.ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
-            user.storeSignUp(postStoreReq.getNickname(), postStoreReq.getStoreImgUrl(), refreshToken, Role.STORE);
+            user.storeSignUp(postStoreReq.getNickname(), postStoreReq.getStoreImgUrl(), Role.STORE);
             userRepository.save(user);
 
             Store store = Store.builder()
diff --git a/src/main/java/com/codepatissier/keki/user/controller/UserController.java b/src/main/java/com/codepatissier/keki/user/controller/UserController.java
index 1890854..d9a6ef6 100644
--- a/src/main/java/com/codepatissier/keki/user/controller/UserController.java
+++ b/src/main/java/com/codepatissier/keki/user/controller/UserController.java
@@ -8,6 +8,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import com.codepatissier.keki.user.service.AuthService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpSession;
 
@@ -21,30 +22,6 @@
 public class UserController {
     private final UserService userService;
     private final AuthService authService;
-    private final NaverService naverService;
-    private final KakaoService kakaoService;
-    private final GoogleService googleService;
-
-    // 카카오 로그인 url 요청
-    @GetMapping("/login/kakao")
-    public BaseResponse<?> kakaoLogin(HttpSession session) {
-        String httpHeaders = kakaoService.getAuthorizationUrl(session);
-        return new BaseResponse<>(httpHeaders);
-    }
-
-    // 네이버 로그인 url 요청
-    @GetMapping("/login/naver")
-    public BaseResponse<?> naverLogin(HttpSession session) {
-        String httpHeaders = naverService.getAuthorizationUrl(session);
-        return new BaseResponse<>(httpHeaders);
-    }
-
-    // 구글 로그인 url 요청
-    @GetMapping("/login/google")
-    public BaseResponse<?> googleLogin(HttpSession session) {
-        String httpHeaders = googleService.getAuthorizationUrl(session);
-        return new BaseResponse<>(httpHeaders);
-    }
 
     // 소셜 로그인/회원가입
     @ResponseBody
@@ -107,7 +84,7 @@ public BaseResponse<?> modifyProfile(@RequestBody PatchProfileReq patchProfileRe
     }
 
     // 회원 탈퇴
-    @PatchMapping("/signout")
+    @DeleteMapping("/signout")
     public BaseResponse<?> signout() {
         try{
             Long userIdx = authService.getUserIdx();
@@ -130,4 +107,15 @@ public BaseResponse<?> logout() {
         }
     }
 
+    // AccessToken 재발급
+    @ResponseBody
+    @PostMapping("/reissue")
+    public BaseResponse<?> reissueToken(@RequestBody PostTokenReq postTokenReq) {
+        try{
+            return new BaseResponse<>(userService.reissueToken(postTokenReq));
+        }catch (BaseException e){
+            return new BaseResponse<>(e.getStatus());
+        }
+    }
+
 }
diff --git a/src/main/java/com/codepatissier/keki/user/dto/PostTokenReq.java b/src/main/java/com/codepatissier/keki/user/dto/PostTokenReq.java
new file mode 100644
index 0000000..4f84425
--- /dev/null
+++ b/src/main/java/com/codepatissier/keki/user/dto/PostTokenReq.java
@@ -0,0 +1,15 @@
+package com.codepatissier.keki.user.dto;
+
+import lombok.Getter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+public class PostTokenReq {
+    @NotBlank
+    private String email;
+    @NotBlank
+    private String provider;
+    @NotBlank
+    private String refreshToken;
+}
diff --git a/src/main/java/com/codepatissier/keki/user/entity/Provider.java b/src/main/java/com/codepatissier/keki/user/entity/Provider.java
index e544d02..a759137 100644
--- a/src/main/java/com/codepatissier/keki/user/entity/Provider.java
+++ b/src/main/java/com/codepatissier/keki/user/entity/Provider.java
@@ -9,7 +9,9 @@ public enum Provider {
     KAKAO(1, "카카오"),
     NAVER(2, "네이버"),
     GOOGLE(3, "구글"),
-    ANONYMOUS(4,"비회원");
+
+    APPLE(4, "애플"),
+    ANONYMOUS(5,"비회원");
 
     private int number;
     private String name;
diff --git a/src/main/java/com/codepatissier/keki/user/entity/User.java b/src/main/java/com/codepatissier/keki/user/entity/User.java
index b619d82..17470e6 100644
--- a/src/main/java/com/codepatissier/keki/user/entity/User.java
+++ b/src/main/java/com/codepatissier/keki/user/entity/User.java
@@ -3,10 +3,12 @@
 import com.codepatissier.keki.common.BaseEntity;
 import com.codepatissier.keki.common.Constant;
 import com.codepatissier.keki.common.Role;
+import com.codepatissier.keki.common.entityListener.UserEntityListener;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.SQLDelete;
 
 import javax.persistence.*;
 
@@ -14,6 +16,8 @@
 @Entity
 @NoArgsConstructor
 @DynamicInsert
+@SQLDelete(sql = "UPDATE user SET status = 'inactive', last_modified_date = current_timestamp WHERE user_idx = ?")
+@EntityListeners(UserEntityListener.class)
 public class User extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -32,8 +36,6 @@ public class User extends BaseEntity {
     @Column(length = 300)
     private String profileImg;
 
-    private String refreshToken;
-
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)
     private Role role;
@@ -45,9 +47,8 @@ public User(String email, Provider provider, Role role) {
         this.role = role;
     }
 
-    public void signup(String nickname, String refreshToken, Role role, String profileImg) {
+    public void signup(String nickname, Role role, String profileImg) {
         this.nickname = nickname;
-        this.refreshToken = refreshToken;
         this.role = role;
         this.profileImg = profileImg;
     }
@@ -56,10 +57,9 @@ public String getRole() {
         return this.role.getName();
     }
 
-    public void storeSignUp(String nickname, String profileImg, String refreshToken, Role role) {
+    public void storeSignUp(String nickname, String profileImg, Role role) {
         this.nickname = nickname;
         this.profileImg = profileImg;
-        this.refreshToken = refreshToken;
         this.role = role;
     }
     
@@ -78,22 +78,18 @@ public void setProfileImg(String profileImg) {
     public void setNickname(String nickname) {
         this.nickname = nickname;
     }
+    public void setRole(Role role) {this.role = role;}
 
     // 회원 탈퇴
     public void signout() {
-        this.nickname = "알 수 없음";
-        this.email = "anonymous@keki.store";
-        this.provider = Provider.ANONYMOUS;
-        this.profileImg = null;
-        this.refreshToken = null;
-        this.role = Role.ANONYMOUS;
+        this.setNickname("알 수 없음");
+        this.setProfileImg(null);
+        this.setRole(Role.ANONYMOUS);
         this.setStatus(Constant.INACTIVE_STATUS);
-        // TODO status enum으로 변경
     }
 
     // 회원 로그아웃
     public void logout() {
-        this.refreshToken = null;
         this.setStatus(Constant.LOGOUT_STATUS);
     }
 
diff --git a/src/main/java/com/codepatissier/keki/user/repository/UserRepository.java b/src/main/java/com/codepatissier/keki/user/repository/UserRepository.java
index 155969c..a887bcc 100644
--- a/src/main/java/com/codepatissier/keki/user/repository/UserRepository.java
+++ b/src/main/java/com/codepatissier/keki/user/repository/UserRepository.java
@@ -11,7 +11,7 @@
 public interface UserRepository extends JpaRepository<User, Long> {
     boolean existsByNickname(String nickname);
     Optional<User> findByUserIdxAndStatusEquals(Long userIdx, String status);
-    User findByEmailAndProviderAndStatusEquals(String email, Provider provider, String activeStatus);
-
     User findByEmailAndProvider(String email, Provider provider);
+
+    Optional<User> findByEmailAndProviderAndStatusEquals(String email, Provider provider, String status);
 }
diff --git a/src/main/java/com/codepatissier/keki/user/service/AuthService.java b/src/main/java/com/codepatissier/keki/user/service/AuthService.java
index 0760346..f64ced4 100644
--- a/src/main/java/com/codepatissier/keki/user/service/AuthService.java
+++ b/src/main/java/com/codepatissier/keki/user/service/AuthService.java
@@ -1,9 +1,11 @@
 package com.codepatissier.keki.user.service;
 
+import java.time.Duration;
 import java.util.Date;
 
 
 import com.codepatissier.keki.common.BaseException;
+import com.codepatissier.keki.common.Constant;
 import com.codepatissier.keki.user.dto.PostUserRes;
 import io.jsonwebtoken.*;
 
@@ -13,6 +15,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import org.springframework.web.context.request.RequestContextHolder;
@@ -32,6 +35,8 @@ public class AuthService {
     private final int accessTokenExpiryDate = 604800000;
     private final int refreshTokenExpiryDate = 604800000;
 
+    private final RedisTemplate<String, String> redisTemplate;
+
     @Value("${auth.key}")
     private String key;
 
@@ -58,9 +63,11 @@ public Long getUserIdx() throws BaseException{
     }
 
     // 토큰 추출
-    private static String getToken() {
+    private String getToken() throws BaseException {
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
         String token = request.getHeader(REQUEST_HEADER_NAME);
+        if (token == null) return null;
+        if(redisTemplate.opsForValue().get(token)!=null) throw new BaseException(INVALID_TOKEN);
         return token;
     }
 
@@ -73,6 +80,10 @@ public Jws<Claims> getClaims(String token) throws BaseException{
                     .parseClaimsJws(token);
         } catch (ExpiredJwtException expiredJwtException) {
             throw new BaseException(EXPIRED_TOKEN);
+        } catch (MalformedJwtException malformedJwtException) {
+            throw new BaseException(MALFORMED_TOKEN);
+        } catch (UnsupportedJwtException unsupportedJwtException) {
+            throw new BaseException(UNSUPPORTED_TOKEN);
         } catch (Exception e) {
             throw new BaseException(INVALID_TOKEN);
         }
@@ -91,6 +102,7 @@ public String createRefreshToken(Long userIdx) {
                 .setExpiration(new Date(now.getTime() + refreshTokenExpiryDate))
                 .signWith(SignatureAlgorithm.HS256, key)
                 .compact();
+        redisTemplate.opsForValue().set(String.valueOf(userIdx), refreshToken, Duration.ofMillis(refreshTokenExpiryDate));
         return refreshToken;
     }
 
@@ -105,4 +117,40 @@ public String createAccessToken(Long userIdx) {
         return accessToken;
     }
 
+    public String validateRefreshToken(Long userIdx, String refreshTokenReq) throws BaseException {
+        String refreshToken = (String) redisTemplate.opsForValue().get(String.valueOf(userIdx));
+        if(!refreshToken.equals(refreshTokenReq)) throw new BaseException(INVALID_TOKEN);
+        return refreshToken;
+    }
+
+    // 회원 로그아웃
+    public void logout(Long userIdx) throws BaseException {
+        deleteToken(userIdx);
+        String token = getToken();
+        registerBlackList(token, Constant.LOGOUT_STATUS);
+    }
+
+    // 회원 탈퇴
+    public void signout(Long userIdx) throws BaseException {
+        deleteToken(userIdx);
+        String token = getToken();
+        registerBlackList(token, Constant.INACTIVE_STATUS);
+    }
+
+    // refreshToken 삭제
+    public void deleteToken(Long userIdx) {
+        String key = String.valueOf(userIdx);
+        if(redisTemplate.opsForValue().get(key)!=null) redisTemplate.delete(key);
+    }
+
+    // 유효한 토큰 blacklist로 등록
+    private void registerBlackList(String token, String status) {
+        token = token.replaceAll(TOKEN_REGEX, TOKEN_REPLACEMENT);
+        Date AccessTokenExpiration = Jwts.parser().setSigningKey(key).parseClaimsJws(token).getBody().getExpiration();
+        long now = (new Date()).getTime();
+
+        Long expiration = AccessTokenExpiration.getTime() - now;
+        redisTemplate.opsForValue().set(token, status, Duration.ofMillis(expiration));
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/codepatissier/keki/user/service/GoogleService.java b/src/main/java/com/codepatissier/keki/user/service/GoogleService.java
deleted file mode 100644
index b0108e3..0000000
--- a/src/main/java/com/codepatissier/keki/user/service/GoogleService.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.codepatissier.keki.user.service;
-
-import com.codepatissier.keki.user.dto.GoogleLogin;
-import com.github.scribejava.core.builder.ServiceBuilder;
-import com.github.scribejava.core.oauth.OAuth20Service;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
-import com.nimbusds.jose.shaded.json.parser.ParseException;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpSession;
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-
-@Service
-@RequiredArgsConstructor
-public class GoogleService {
-
-    @Value("${google.client-id}")
-    private String client_id;
-
-    @Value("${google.redirect_uri}")
-    private String redirect_uri;
-
-    @Value("${google.client-secret}")
-    private String client_secret;
-
-    private final static String USER_INFO_URL = "https://www.googleapis.com/userinfo/v2/me?access_token=";
-    private final static String ACCESS_TOKEN_URL = "https://www.googleapis.com/oauth2/v4/token";
-
-    public String getAuthorizationUrl(HttpSession session) {
-        OAuth20Service oauthService = new ServiceBuilder()
-                .apiKey(client_id)
-                .apiSecret(client_secret)
-                .callback(redirect_uri)
-                .scope("email")
-                .build(GoogleLogin.instance());
-
-        return oauthService.getAuthorizationUrl();
-    }
-
-    public String getAccessToken(HttpSession session, String authorize_code) throws IOException {
-        String access_Token = "";
-
-        try {
-            URL url = new URL(ACCESS_TOKEN_URL);
-
-            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-
-            conn.setRequestMethod("POST");
-            conn.setDoOutput(true);
-
-            BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream()));
-            StringBuilder sb = new StringBuilder();
-            sb.append("grant_type=authorization_code");
-
-            sb.append("&client_id="+client_id);
-            sb.append("&client_secret="+client_secret);
-            sb.append("&redirect_uri="+redirect_uri);
-            sb.append("&code="+authorize_code);
-            bw.write(sb.toString());
-            bw.flush();
-
-            BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            String line = "";
-            String result = "";
-
-            while ((line = br.readLine()) != null) {
-                result += line;
-            }
-
-            JsonParser parser = new JsonParser();
-            JsonElement element = parser.parse(result);
-            access_Token = element.getAsJsonObject().get("access_token").getAsString();
-            br.close();
-            bw.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return access_Token;
-    }
-
-    public String getUserInfo(String access_Token) throws IOException, ParseException {
-        String reqURL = USER_INFO_URL+access_Token;
-        try {
-            URL url = new URL(reqURL);
-            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-            conn.setRequestProperty("Authorization", "Bearer " + access_Token);
-
-            BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            String line = "";
-            String result = "";
-            while ((line = br.readLine()) != null) {
-                result += line;
-            }
-            JsonParser parser = new JsonParser();
-            JsonElement element = parser.parse(result);
-            String email = element.getAsJsonObject().get("email").getAsString();
-            return email;
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/codepatissier/keki/user/service/KakaoService.java b/src/main/java/com/codepatissier/keki/user/service/KakaoService.java
deleted file mode 100644
index 74be867..0000000
--- a/src/main/java/com/codepatissier/keki/user/service/KakaoService.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.codepatissier.keki.user.service;
-
-import com.codepatissier.keki.user.dto.KakaoLogin;
-import com.codepatissier.keki.user.dto.NaverLogin;
-import com.github.scribejava.core.builder.ServiceBuilder;
-import com.github.scribejava.core.oauth.OAuth20Service;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpSession;
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.HashMap;
-
-@Service
-@RequiredArgsConstructor
-public class KakaoService {
-
-    @Value("${kakao.client-id}")
-    private String client_id;
-
-    @Value("${kakao.redirect_uri}")
-    private String redirect_uri;
-
-    public String getAuthorizationUrl(HttpSession session) {
-        OAuth20Service oauthService = new ServiceBuilder()
-                .apiKey(client_id)
-                .callback(redirect_uri)
-                .build(KakaoLogin.instance());
-        return oauthService.getAuthorizationUrl();
-    }
-
-    public String getAccessToken (String authorize_code) {
-        String access_Token = "";
-        String refresh_Token = "";
-        String reqURL = "https://kauth.kakao.com/oauth/token";
-
-        try {
-            URL url = new URL(reqURL);
-
-            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-
-            conn.setRequestMethod("POST");
-            conn.setDoOutput(true);
-
-            BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(conn.getOutputStream()));
-            StringBuilder sb = new StringBuilder();
-            sb.append("grant_type=authorization_code");
-
-
-            sb.append("&client_id="+client_id);
-            sb.append("&redirect_uri="+redirect_uri);
-
-            sb.append("&code=" + authorize_code);
-            bw.write(sb.toString());
-            bw.flush();
-
-            BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            String line = "";
-            String result = "";
-
-            while ((line = br.readLine()) != null) {
-                result += line;
-            }
-
-            JsonParser parser = new JsonParser();
-            JsonElement element = parser.parse(result);
-
-            access_Token = element.getAsJsonObject().get("access_token").getAsString();
-            refresh_Token = element.getAsJsonObject().get("refresh_token").getAsString();
-
-            br.close();
-            bw.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return access_Token;
-    }
-
-    public String getUserInfo(String access_Token) {
-
-        HashMap<String, Object> userInfo = new HashMap<String, Object>();
-        String reqURL = "https://kapi.kakao.com/v2/user/me";
-        try {
-            URL url = new URL(reqURL);
-            HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-            conn.setRequestMethod("GET");
-
-            conn.setRequestProperty("Authorization", "Bearer " + access_Token);
-
-            int responseCode = conn.getResponseCode();
-            System.out.println("responseCode : " + responseCode);
-
-            BufferedReader br = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-
-            String line = "";
-            String result = "";
-
-            while ((line = br.readLine()) != null) {
-                result += line;
-            }
-            System.out.println("response body : " + result);
-            JsonParser parser = new JsonParser();
-            JsonElement element = parser.parse(result);
-            JsonObject kakao_account = element.getAsJsonObject().get("kakao_account").getAsJsonObject();
-            String email = kakao_account.getAsJsonObject().get("email").getAsString();
-            userInfo.put("email", email);
-            return email;
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-}
diff --git a/src/main/java/com/codepatissier/keki/user/service/NaverService.java b/src/main/java/com/codepatissier/keki/user/service/NaverService.java
deleted file mode 100644
index 5b2bcf5..0000000
--- a/src/main/java/com/codepatissier/keki/user/service/NaverService.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.codepatissier.keki.user.service;
-
-import com.codepatissier.keki.user.dto.NaverLogin;
-import com.github.scribejava.core.builder.ServiceBuilder;
-import com.github.scribejava.core.model.OAuth2AccessToken;
-import com.github.scribejava.core.model.OAuthRequest;
-import com.github.scribejava.core.model.Response;
-import com.github.scribejava.core.model.Verb;
-import com.github.scribejava.core.oauth.OAuth20Service;
-import com.nimbusds.jose.shaded.json.JSONObject;
-import com.nimbusds.jose.shaded.json.parser.JSONParser;
-import com.nimbusds.jose.shaded.json.parser.ParseException;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpSession;
-import java.io.IOException;
-import java.util.UUID;
-
-@Service
-@RequiredArgsConstructor
-public class NaverService {
-
-    @Value("${naver.client-id}")
-    private String client_id;
-
-    @Value("${naver.redirect_uri}")
-    private String redirect_uri;
-
-    @Value("${naver.client-secret}")
-    private String client_secret;
-
-    private final static String SESSION_STATE = "oauth_state";
-    private final static String PROFILE_API_URL = "https://openapi.naver.com/v1/nid/me";
-
-    public String getAuthorizationUrl(HttpSession session) {
-
-        String state = UUID.randomUUID().toString();
-        session.setAttribute(SESSION_STATE, state);
-
-        OAuth20Service oauthService = new ServiceBuilder()
-                .apiKey(client_id)
-                .apiSecret(client_secret)
-                .callback(redirect_uri)
-                .build(NaverLogin.instance());
-
-        return oauthService.getAuthorizationUrl();
-    }
-
-    public OAuth2AccessToken getAccessToken(HttpSession session, String code) throws IOException {
-
-        OAuth20Service oauthService = new ServiceBuilder()
-                .apiKey(client_id)
-                .apiSecret(client_secret)
-                .callback(redirect_uri)
-                .build(NaverLogin.instance());
-
-        OAuth2AccessToken accessToken = oauthService.getAccessToken(code);
-        return accessToken;
-    }
-
-    public String getUserInfo(OAuth2AccessToken oauthToken) throws IOException, ParseException {
-        OAuth20Service oauthService =new ServiceBuilder()
-                .apiKey(client_id)
-                .apiSecret(client_secret)
-                .callback(redirect_uri).build(NaverLogin.instance());
-
-        OAuthRequest request = new OAuthRequest(Verb.GET, PROFILE_API_URL, oauthService.getConfig());
-        oauthService.signRequest(oauthToken, request);
-        Response response = request.send();
-        String apiResult = response.getBody();
-
-        JSONParser jsonParser = new JSONParser();
-        JSONObject jsonObj;
-
-        jsonObj = (JSONObject) jsonParser.parse(apiResult);
-        JSONObject response_obj = (JSONObject) jsonObj.get("response");
-
-        String email = (String) response_obj.get("email");
-        return email;
-    }
-
-}
diff --git a/src/main/java/com/codepatissier/keki/user/service/UserService.java b/src/main/java/com/codepatissier/keki/user/service/UserService.java
index 668bc9c..bbfe8e9 100644
--- a/src/main/java/com/codepatissier/keki/user/service/UserService.java
+++ b/src/main/java/com/codepatissier/keki/user/service/UserService.java
@@ -13,8 +13,8 @@
 import org.springframework.transaction.annotation.Transactional;
 
 
-
 import static com.codepatissier.keki.common.BaseResponseStatus.*;
+import static com.codepatissier.keki.common.Constant.ACTIVE_STATUS;
 
 
 @Service
@@ -56,14 +56,14 @@ private User signup(String email, Provider provider) {
     }
 
     // 구매자 회원가입
-    @Transactional // TODO @Transactional(rollbackFor = Exception.class) 수정
+    @Transactional(rollbackFor = Exception.class)
     public PostUserRes signupCustomer(Long userIdx, PostCustomerReq postCustomerReq) throws BaseException{
         try {
-            User user = userRepository.findByUserIdxAndStatusEquals(userIdx, Constant.ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+            User user = userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
             String accessToken = authService.createAccessToken(userIdx);
             String refreshToken = authService.createRefreshToken(userIdx);
 
-            user.signup(postCustomerReq.getNickname(), refreshToken, Role.CUSTOMER, postCustomerReq.getProfileImg());
+            user.signup(postCustomerReq.getNickname(), Role.CUSTOMER, postCustomerReq.getProfileImg());
             userRepository.save(user);
 
             return new PostUserRes(accessToken, refreshToken, user.getRole());
@@ -83,14 +83,14 @@ public void checkNickname(PostNicknameReq postNicknameReq) throws BaseException{
     // 구매자 마이페이지 조회
     public GetProfileRes getProfile() throws BaseException {
         Long userIdx = authService.getUserIdx();
-        User user = userRepository.findByUserIdxAndStatusEquals(userIdx, Constant.ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+        User user = userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
         return new GetProfileRes(user.getEmail(), user.getNickname(), user.getProfileImg());}
 
     // 구매자 프로필 수정
     @Transactional
     public void modifyProfile(Long userIdx, PatchProfileReq patchProfileReq) throws BaseException{
         try {
-            User user = userRepository.findByUserIdxAndStatusEquals(userIdx, Constant.ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+            User user = userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
             if (patchProfileReq.getNickname() != null) user.modifyNickname(patchProfileReq.getNickname());
             if (patchProfileReq.getProfileImg() != null) user.modifyProfileImg(patchProfileReq.getProfileImg());
         } catch (BaseException e) {
@@ -101,12 +101,12 @@ public void modifyProfile(Long userIdx, PatchProfileReq patchProfileReq) throws
     }
 
     // 회원 탈퇴
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void signout(Long userIdx) throws BaseException {
         try{
-            User user = userRepository.findByUserIdxAndStatusEquals(userIdx, Constant.ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
-            user.signout();
-            // TODO redis 사용해 토큰 관리
+            User user = userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+            userRepository.delete(user);
+            authService.signout(userIdx);
         } catch (BaseException e) {
             throw e;
         } catch (Exception e) {
@@ -118,9 +118,9 @@ public void signout(Long userIdx) throws BaseException {
     @Transactional
     public void logout(Long userIdx) throws BaseException {
         try{
-            User user = userRepository.findByUserIdxAndStatusEquals(userIdx, Constant.ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+            User user = userRepository.findByUserIdxAndStatusEquals(userIdx, ACTIVE_STATUS).orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+            authService.logout(userIdx);
             user.logout();
-            // TODO redis 사용해 토큰 관리
         } catch (BaseException e) {
             throw e;
         } catch (Exception e) {
@@ -128,4 +128,12 @@ public void logout(Long userIdx) throws BaseException {
         }
     }
 
+    // AccessToken 재발급
+    @Transactional
+    public PostUserRes reissueToken(PostTokenReq postTokenReq) throws BaseException{
+        User user = userRepository.findByEmailAndProviderAndStatusEquals(postTokenReq.getEmail(), Provider.getProviderByName(postTokenReq.getProvider()), ACTIVE_STATUS)
+                .orElseThrow(() -> new BaseException(INVALID_USER_IDX));
+        authService.validateRefreshToken(user.getUserIdx(), postTokenReq.getRefreshToken());
+        return authService.createToken(user);
+    }
 }
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 45f852f..fe1e8ec 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -10,6 +10,5 @@ spring.jpa.database=mysql
 
 jasypt.encryptor.bean= jasyptStringEncryptor
 
-# oauth
-spring.profiles.include=oauth
- 
+# oauth, redis
+spring.profiles.include=oauth, redis
diff --git a/src/test/java/com/codepatissier/keki/CascadeTests.java b/src/test/java/com/codepatissier/keki/CascadeTests.java
new file mode 100644
index 0000000..1ff4b83
--- /dev/null
+++ b/src/test/java/com/codepatissier/keki/CascadeTests.java
@@ -0,0 +1,71 @@
+package com.codepatissier.keki;
+
+import com.codepatissier.keki.calendar.entity.CalendarTag;
+import com.codepatissier.keki.calendar.repository.CalendarTag.CalendarTagRepository;
+import com.codepatissier.keki.common.BaseException;
+import com.codepatissier.keki.dessert.entity.Dessert;
+import com.codepatissier.keki.dessert.repository.DessertRepository;
+import com.codepatissier.keki.history.entity.PostHistory;
+import com.codepatissier.keki.history.repository.PostHistoryRepository;
+import com.codepatissier.keki.store.entity.Store;
+import com.codepatissier.keki.store.repository.StoreRepository;
+import com.codepatissier.keki.user.entity.User;
+import com.codepatissier.keki.user.repository.UserRepository;
+import com.codepatissier.keki.user.service.UserService;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+import static com.codepatissier.keki.common.Constant.*;
+import static org.assertj.core.api.Assertions.*;
+
+@SpringBootTest
+@Transactional
+public class CascadeTests {
+    @Autowired
+    UserService userService;
+    @Autowired
+    UserRepository userRepository;
+    @Autowired
+    StoreRepository storeRepository;
+    @Autowired
+    DessertRepository dessertRepository;
+    @Autowired
+    PostHistoryRepository postHistoryRepository;
+    @Autowired
+    CalendarTagRepository calendarTagRepository;
+
+    @Test
+    @DisplayName("판매자 회원탈퇴 시 관련 DB 전체 INACTIVE 처리")
+    void signOutStore_AllConnectedDB_INACTIVE() throws BaseException {
+        // given
+        User user = userRepository.findById(2L).orElseThrow();
+        // when
+        userService.signout(user.getUserIdx());
+        // then
+        Store store = storeRepository.findByUser(user).orElseThrow();
+        List<Dessert> desserts = dessertRepository.findByStoreAndStatusOrderByDessertIdx(store,ACTIVE_STATUS);
+        assertThat(user.getStatus()).isEqualTo(INACTIVE_STATUS);
+        assertThat(store.getStatus()).isEqualTo(INACTIVE_STATUS);
+        assertThat(desserts.size()).isEqualTo(0);
+    }
+
+    @Test
+    @DisplayName("구매자 회원탈퇴 시 관련 DB 전체 INACTIVE 처리")
+    void signOutCustomer_AllConnectedDB_INACTIVE() throws BaseException {
+        // given
+        User user = userRepository.findById(3L).orElseThrow();
+        // when
+        userService.signout(user.getUserIdx());
+        // then
+        List<PostHistory> postHistoryList = postHistoryRepository.findByUserAndStatus(user, ACTIVE_STATUS);
+        List<CalendarTag> calendarTagList = calendarTagRepository.findByCalendarUserAndStatus(user, ACTIVE_STATUS);
+        assertThat(user.getStatus()).isEqualTo(INACTIVE_STATUS);
+        assertThat(postHistoryList.size()).isEqualTo(0);
+        assertThat(calendarTagList.size()).isEqualTo(0);
+    }
+}