From 75485f988a6783082ea1a948f170f47ba46cd991 Mon Sep 17 00:00:00 2001
From: daheeParkk <qkrekgml7414@naver.com>
Date: Sun, 3 Mar 2024 22:15:51 +0900
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=EC=82=AD=EC=A0=9C=EB=90=9C=20?=
 =?UTF-8?q?=EC=83=81=EC=A0=90=EC=97=90=EC=84=9C=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../koreatech/in/repository/admin/AdminShopMapper.java    | 2 ++
 .../koreatech/in/service/admin/AdminShopServiceImpl.java  | 7 ++++++-
 src/main/resources/mapper/admin/AdminShopMapper.xml       | 8 ++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/koreatech/in/repository/admin/AdminShopMapper.java b/src/main/java/koreatech/in/repository/admin/AdminShopMapper.java
index ca428b62..45bc917e 100644
--- a/src/main/java/koreatech/in/repository/admin/AdminShopMapper.java
+++ b/src/main/java/koreatech/in/repository/admin/AdminShopMapper.java
@@ -70,6 +70,8 @@ public interface AdminShopMapper {
 
     Shop getShopById(@Param("id") Integer id);
 
+    Shop getDeletedShopById(@Param("id") Integer id);
+
     ShopMenuCategory getMenuCategoryByShopIdAndName(@Param("shopId") Integer shopId, @Param("name") String name);
 
     Integer getCountOfMenuCategoriesByShopId(@Param("shopId") Integer shopId);
diff --git a/src/main/java/koreatech/in/service/admin/AdminShopServiceImpl.java b/src/main/java/koreatech/in/service/admin/AdminShopServiceImpl.java
index 265e3bed..2d29f0d2 100644
--- a/src/main/java/koreatech/in/service/admin/AdminShopServiceImpl.java
+++ b/src/main/java/koreatech/in/service/admin/AdminShopServiceImpl.java
@@ -320,7 +320,7 @@ public void deleteShop(Integer shopId) {
 
     @Override
     public void undeleteOfShop(Integer shopId) {
-        Shop shop = getShopById(shopId);
+        Shop shop = getDeletedShopById(shopId);
 
         if (!shop.isDeleted()) {
             throw new BaseException(SHOP_NOT_DELETED);
@@ -627,6 +627,11 @@ private Shop getShopById(Integer id) {
                 .orElseThrow(() -> new BaseException(SHOP_NOT_FOUND));
     }
 
+    private Shop getDeletedShopById(Integer id) {
+        return Optional.ofNullable(adminShopMapper.getDeletedShopById(id))
+                .orElseThrow(() -> new BaseException(SHOP_NOT_FOUND));
+    }
+
     private ShopMenu getMenuByIdAndShopId(Integer menuId, Integer shopId) {
         ShopMenu menu = Optional.ofNullable(adminShopMapper.getMenuById(menuId))
                 .orElseThrow(() -> new BaseException(SHOP_MENU_NOT_FOUND));
diff --git a/src/main/resources/mapper/admin/AdminShopMapper.xml b/src/main/resources/mapper/admin/AdminShopMapper.xml
index 690540e1..dad0eece 100644
--- a/src/main/resources/mapper/admin/AdminShopMapper.xml
+++ b/src/main/resources/mapper/admin/AdminShopMapper.xml
@@ -529,6 +529,14 @@
             AND `is_deleted` =  0
     </select>
 
+    <select id="getDeletedShopById" parameterType="integer" resultType="koreatech.in.domain.Shop.Shop">
+        SELECT *
+        FROM `koin`.`shops`
+        WHERE
+            `id` = #{id}
+          AND `is_deleted` =  1
+    </select>
+
     <select id="getMenuCategoryByShopIdAndName" resultType="koreatech.in.domain.Shop.ShopMenuCategory">
         SELECT *
         FROM `koin`.`shop_menu_categories`

From 4423b8c3a5017168f29082ccb6f3e0d76429facd Mon Sep 17 00:00:00 2001
From: daheeParkk <qkrekgml7414@naver.com>
Date: Sun, 3 Mar 2024 22:31:04 +0900
Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=EC=82=AD=EC=A0=9C=EB=90=9C=20?=
 =?UTF-8?q?=EC=83=81=EC=A0=90=EB=8F=84=20=EB=AA=A8=EB=91=90=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../koreatech/in/repository/admin/AdminShopMapper.java   | 2 --
 .../koreatech/in/service/admin/AdminShopServiceImpl.java | 7 +------
 src/main/resources/mapper/admin/AdminShopMapper.xml      | 9 ---------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/main/java/koreatech/in/repository/admin/AdminShopMapper.java b/src/main/java/koreatech/in/repository/admin/AdminShopMapper.java
index 45bc917e..ca428b62 100644
--- a/src/main/java/koreatech/in/repository/admin/AdminShopMapper.java
+++ b/src/main/java/koreatech/in/repository/admin/AdminShopMapper.java
@@ -70,8 +70,6 @@ public interface AdminShopMapper {
 
     Shop getShopById(@Param("id") Integer id);
 
-    Shop getDeletedShopById(@Param("id") Integer id);
-
     ShopMenuCategory getMenuCategoryByShopIdAndName(@Param("shopId") Integer shopId, @Param("name") String name);
 
     Integer getCountOfMenuCategoriesByShopId(@Param("shopId") Integer shopId);
diff --git a/src/main/java/koreatech/in/service/admin/AdminShopServiceImpl.java b/src/main/java/koreatech/in/service/admin/AdminShopServiceImpl.java
index 2d29f0d2..265e3bed 100644
--- a/src/main/java/koreatech/in/service/admin/AdminShopServiceImpl.java
+++ b/src/main/java/koreatech/in/service/admin/AdminShopServiceImpl.java
@@ -320,7 +320,7 @@ public void deleteShop(Integer shopId) {
 
     @Override
     public void undeleteOfShop(Integer shopId) {
-        Shop shop = getDeletedShopById(shopId);
+        Shop shop = getShopById(shopId);
 
         if (!shop.isDeleted()) {
             throw new BaseException(SHOP_NOT_DELETED);
@@ -627,11 +627,6 @@ private Shop getShopById(Integer id) {
                 .orElseThrow(() -> new BaseException(SHOP_NOT_FOUND));
     }
 
-    private Shop getDeletedShopById(Integer id) {
-        return Optional.ofNullable(adminShopMapper.getDeletedShopById(id))
-                .orElseThrow(() -> new BaseException(SHOP_NOT_FOUND));
-    }
-
     private ShopMenu getMenuByIdAndShopId(Integer menuId, Integer shopId) {
         ShopMenu menu = Optional.ofNullable(adminShopMapper.getMenuById(menuId))
                 .orElseThrow(() -> new BaseException(SHOP_MENU_NOT_FOUND));
diff --git a/src/main/resources/mapper/admin/AdminShopMapper.xml b/src/main/resources/mapper/admin/AdminShopMapper.xml
index dad0eece..dd901a77 100644
--- a/src/main/resources/mapper/admin/AdminShopMapper.xml
+++ b/src/main/resources/mapper/admin/AdminShopMapper.xml
@@ -526,15 +526,6 @@
         FROM `koin`.`shops`
         WHERE
             `id` = #{id}
-            AND `is_deleted` =  0
-    </select>
-
-    <select id="getDeletedShopById" parameterType="integer" resultType="koreatech.in.domain.Shop.Shop">
-        SELECT *
-        FROM `koin`.`shops`
-        WHERE
-            `id` = #{id}
-          AND `is_deleted` =  1
     </select>
 
     <select id="getMenuCategoryByShopIdAndName" resultType="koreatech.in.domain.Shop.ShopMenuCategory">

From 6b90272e4dd743ec0a29c64350a372fbe81cdb1d Mon Sep 17 00:00:00 2001
From: Invidam <hansupark0208@gmail.com>
Date: Tue, 5 Mar 2024 17:40:47 +0900
Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B9=85=20=EC=B6=9C?=
 =?UTF-8?q?=EB=A0=A5=20=EC=9C=84=ED=95=9C=20=EC=84=A4=EC=A0=95=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                         | 33 ++++++++++++++++++++++++++++++++-
 src/main/resources/logback.xml  |  6 ++++++
 src/main/webapp/WEB-INF/web.xml | 18 ++++++++++++++++++
 tomcat/conf/logback-access.xml  | 29 +++++++++++++++++++++++++++++
 4 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/logback.xml
 create mode 100644 tomcat/conf/logback-access.xml

diff --git a/pom.xml b/pom.xml
index df5201f3..d8359fea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -287,10 +287,41 @@
             <version>1.9.4</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.7</version>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>1.7.25</version>
+            <version>2.0.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>2.0.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>2.0.7</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.3.11</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-access</artifactId>
+            <version>1.3.11</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.3.11</version>
         </dependency>
 
         <!-- mongodb -->
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
new file mode 100644
index 00000000..e8bd3213
--- /dev/null
+++ b/src/main/resources/logback.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <logger name="org.springframework" level="INFO"/>
+    <logger name="springfox.documentation" level="ERROR"/>
+
+</configuration>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index c1cb551f..783b27ea 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -15,7 +15,25 @@
             classpath*:common/*.xml
         </param-value>
     </context-param>
+    <filter>
+        <filter-name>TeeFilter</filter-name>
+        <filter-class>ch.qos.logback.access.servlet.TeeFilter</filter-class>
+        <init-param>
+            <param-name>excludes</param-name>
+            <param-value>swagger-ui.html</param-value>
+        </init-param>
+    </filter>
+
+    <filter-mapping>
+        <filter-name>TeeFilter</filter-name>
+        <url-pattern>/*</url-pattern>
+    </filter-mapping>
 
+    <filter-mapping>
+        <filter-name>TeeFilter</filter-name>
+        <url-pattern>/swagger-ui.html</url-pattern> <!-- Add the URL pattern you want to exclude -->
+        <dispatcher>REQUEST</dispatcher> <!-- Exclude only request type -->
+    </filter-mapping>
     <!-- Creates the Spring Container shared by all Servlets and Filters -->
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
diff --git a/tomcat/conf/logback-access.xml b/tomcat/conf/logback-access.xml
new file mode 100644
index 00000000..ceee7eea
--- /dev/null
+++ b/tomcat/conf/logback-access.xml
@@ -0,0 +1,29 @@
+<configuration>
+    <property name="LOG_PATH_NAME" value="${user.home}/http-access.log"/>
+    <property name="HTTP_PATTERN" value="%n######## INFO ########%n- time: %t{yyyy-MM-dd HH:mm:ss}%n- summary: %a\t%r\t%s%n%n######## HTTP REQUEST ########%n%header{Referer}\t%header{User-Agent}\t%D\t%I%n%fullRequest%n######## HTTP RESPONSE ########%n%fullResponse%n--------%n"/>
+
+
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${LOG_PATH_NAME}/access.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${LOG_PATH_NAME}/access.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>30</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${HTTP_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${HTTP_PATTERN}</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.springframework" level="ERROR"/>
+    <logger name="springfox.documentation" level="ERROR"/>
+    <logger name="springfox.documentation.schema.property.bean.BeanModelProperty" level="INFO"/>
+
+    <appender-ref ref="FILE"/>
+    <appender-ref ref="CONSOLE"/>
+</configuration>

From f7c67057b7ba6bc06d1b2b4dd45f42b1b031c10c Mon Sep 17 00:00:00 2001
From: Invidam <hansupark0208@gmail.com>
Date: Tue, 5 Mar 2024 17:43:22 +0900
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=EC=A4=84=20=EA=B5=AC=EB=B6=84=20?=
 =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tomcat/conf/logback-access.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tomcat/conf/logback-access.xml b/tomcat/conf/logback-access.xml
index ceee7eea..15a80e38 100644
--- a/tomcat/conf/logback-access.xml
+++ b/tomcat/conf/logback-access.xml
@@ -1,6 +1,6 @@
 <configuration>
     <property name="LOG_PATH_NAME" value="${user.home}/http-access.log"/>
-    <property name="HTTP_PATTERN" value="%n######## INFO ########%n- time: %t{yyyy-MM-dd HH:mm:ss}%n- summary: %a\t%r\t%s%n%n######## HTTP REQUEST ########%n%header{Referer}\t%header{User-Agent}\t%D\t%I%n%fullRequest%n######## HTTP RESPONSE ########%n%fullResponse%n--------%n"/>
+    <property name="HTTP_PATTERN" value="%n-------- INFO --------%n- time: %t{yyyy-MM-dd HH:mm:ss}%n- summary: %a\t%r\t%s%n%n-------- HTTP REQUEST --------%n%header{Referer}\t%header{User-Agent}\t%D\t%I%n%fullRequest%n-------- HTTP RESPONSE --------%n%fullResponse%n--------%n"/>
 
 
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">