[Deploy] 최종 프로젝트 업로드

.github/workflows/deploy.yml

@@ -0,0 +1,31 @@
+name: Deploy to EC2 Tomcat
+
+on:
+  push:
+    branches:
+      - develop  # develop 브랜치에 push 또는 merge될 때 실행
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest  # GitHub Action이 실행될 환경
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2  # 코드 체크아웃
+
+      # sshpass 설치
+      - name: Install sshpass
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y sshpass
+
+      # EC2에 ssh 접속 및 배포
+      - name: Deploy to EC2
+        run: |
+          sshpass -p "close_DBMS_4" ssh -o StrictHostKeyChecking=no ubuntu@3.34.192.234 << 'EOF'
+            cd /home/ubuntu/project/Reservation 
+            git pull origin develop  
+            ./mvnw clean install -DskipTests     
+            mv target/team4.war /opt/tomcat/webapps/ROOT.war 
+            sudo systemctl restart tomcat 
+          EOF

pom.xml

@@ -215,12 +215,13 @@
 
     <!-- test -->
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.11.4</version>
       <scope>test</scope>
     </dependency>
 
+
     <!-- email -->
     <!-- https://mvnrepository.com/artifact/javax.mail/mail -->
     <dependency>
@@ -242,8 +243,18 @@
       <artifactId>quartz-jobs</artifactId>
       <version>2.3.0</version>
     </dependency>
-
-
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>RELEASE</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>RELEASE</version>
+      <scope>test</scope>
+    </dependency>
 
   </dependencies>
   <build>
@@ -254,7 +265,6 @@
           <artifactId>maven-clean-plugin</artifactId>
           <version>3.1.0</version>
         </plugin>
-
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
           <version>3.0.2</version>
@@ -293,6 +303,38 @@
           <target>11</target>
         </configuration>
       </plugin>
+      <!-- JaCoCo 플러그인 -->
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.12</version> <!-- JaCoCo 버전 설정 -->
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-agent</goal>  <!-- JaCoCo 에이전트 준비 -->
+              <goal>report</goal> <!-- 리포트 생성 -->
+            </goals>
+            <phase>test</phase>  <!-- 테스트 단계에서 실행 -->
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.12</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>html</report>  <!-- HTML 리포트 생성 -->
+              <report>xml</report>  <!-- XML 리포트 생성 -->
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
 </project>

src/main/java/Interceptor/CommonDataInterceptor.java

@@ -0,0 +1,53 @@
+package Interceptor;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import kr.co.team4.model.dto.SellerDTO;
+import kr.co.team4.model.service.SellerPageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.math.BigInteger;
+
+/**
+ * 생성자   : JDeok
+ * 기 능   : 세션체크 및 숙소명 보여주기
+ * 변경사항
+ * - 2025.01.10  : JDeok(최초생성)
+ */
+
+@Component
+public class CommonDataInterceptor implements HandlerInterceptor {
+
+    @Autowired
+    private SellerPageService sellerPageService;
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        HttpSession session = request.getSession();
+        Object sellerSession = session.getAttribute("sellersession");
+
+        if (sellerSession != null) {
+            String lodgmentName = (String) session.getAttribute("lodgmentName");
+            if (lodgmentName == null) {
+
+                SellerDTO seller = (SellerDTO) sellerSession;
+                int seller_idx = seller.getSELLER_IDX().intValue();
+
+                Integer lod_idx = sellerPageService.getLod(seller_idx);
+                if (lod_idx != null && lod_idx > 0) {
+                    lodgmentName = sellerPageService.getLodgmentName(lod_idx);
+                    session.setAttribute("lodgmentName", lodgmentName);
+                }
+            }
+            request.setAttribute("lodgmentName", lodgmentName); // JSP에서 사용할 데이터
+        }
+        return true;
+    }
+}
+
+

src/main/java/Interceptor/SellerInterceptor.java

@@ -0,0 +1,48 @@
+package Interceptor;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+/**
+ * 생성자   : JDeok
+ * 기 능   : 세션체크 및 숙소명 보여주기
+ * 변경사항
+ * - 2025.01.10  : JDeok(최초생성)
+ */
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+@Component
+public class SellerInterceptor implements HandlerInterceptor {
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        HttpSession session = request.getSession(false);
+        if (session == null) {
+            response.sendRedirect("/sellerlogin");
+            return false; // 요청 진행 중단
+        }else{
+            return true;
+        }
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+        // 컨트롤러 처리 후, 뷰 렌더링 전에 실행
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+        // 뷰 렌더링 후 실행 (리소스 정리 등에 사용)
+    }
+}
+

src/main/java/config/MvcConfig.java

@@ -1,23 +1,30 @@
 package config;
 
+import Interceptor.CommonDataInterceptor;
+import Interceptor.SellerInterceptor;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
+import kr.co.team4.model.service.SellerPageService;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import java.util.Properties;
 import org.springframework.format.FormatterRegistry;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.transaction.TransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.web.multipart.MultipartResolver;
@@ -31,13 +38,18 @@
 import javax.sql.DataSource;
 import java.awt.*;
 import java.util.Date;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
 @ComponentScan(basePackages = {"kr.co"})
 @EnableWebMvc
 @MapperScan(basePackages = {"kr.co.team4.model.mapper"}, annotationClass = Mapper.class)
 @EnableTransactionManagement
+@EnableScheduling
+@ComponentScan(basePackages = {"kr.co", "Interceptor"})
 public class MvcConfig implements WebMvcConfigurer {
+
     // ViewResolver - 포워딩할 경로 앞/뒤 설정
     @Override
     public void configureViewResolvers(ViewResolverRegistry registry) {
@@ -70,6 +82,15 @@ public DataSourceTransactionManager transactionManager(DataSource dataSource) {
         return new DataSourceTransactionManager(dataSource);
     }
 
+    @Bean // 배치작업 빈 등록
+    public ThreadPoolTaskScheduler taskScheduler(){
+        ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
+        scheduler.setPoolSize(10);  // 스케줄러의 스레드 풀 크기 설정
+        scheduler.setThreadNamePrefix("scheduled-task-");
+        scheduler.initialize();
+        return scheduler;
+    }
+
     @Bean
     public DataSource dataSource(){
 
@@ -168,6 +189,26 @@ public JavaMailSender javaMailService() {
         return javaMailSender;
     }
 
+    /*2025.01.10 JDeok 추가 */
+    private final SellerInterceptor sellerInterceptor;
+    private final CommonDataInterceptor commonDataInterceptor;
+
+    public MvcConfig(@Lazy SellerInterceptor sellerInterceptor, @Lazy CommonDataInterceptor commonDataInterceptor) {
+        this.sellerInterceptor = sellerInterceptor;
+        this.commonDataInterceptor = commonDataInterceptor;
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        // 1. LoginInterceptor 등록
+        registry.addInterceptor(sellerInterceptor)
+                .addPathPatterns("/lodgment/**")  // 로그인 필수 URL
+                .excludePathPatterns("/auth/**", "/static/**"); // 제외 URL
+
+        // 2. CommonDataInterceptor 등록
+        registry.addInterceptor(commonDataInterceptor)
+                .addPathPatterns("/lodgment/**"); // 공통 데이터 적용 URL
+    }
 
 
 }

src/main/java/filter/LoginSessionFilter.java

@@ -0,0 +1,52 @@
+package filter;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+
+public class LoginSessionFilter implements Filter {
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException {
+
+        // HttpServletRequest로 형변환
+        HttpServletRequest httpRequest = (HttpServletRequest) request;
+
+        // 세션 가져오기
+        HttpSession session = httpRequest.getSession(false); // 세션이 존재하지 않으면 null 반환
+
+        // /userlogin 경로는 필터에서 제외
+        if (httpRequest.getRequestURI().equals("common/alert")) {
+            filterChain.doFilter(request, response);
+            return;
+        }
+
+        if (session == null || session.getAttribute("usersession") == null) {
+
+            // 현재 요청 URL과 GET 파라미터를 세션에 저장
+            String requestedUrl = httpRequest.getRequestURL().toString();
+            String queryString = httpRequest.getQueryString();  // 쿼리 파라미터 가져오기
+            // 쿼리 파라미터 존재하는 경우만 추가로 더해서 기억
+            String returnUrl = (queryString != null) ? requestedUrl + "?" + queryString : requestedUrl;
+            session.setAttribute("redirectUrl", returnUrl);
+
+            request.setAttribute("msg", "로그인이 필요합니다");
+            // 세션에 사용자 정보가 없으면 로그인 페이지로 리다이렉트
+            request.getRequestDispatcher("/userlogin").forward(request, response);
+        } else {
+            // 세션에 사용자 정보가 있으면 다음 필터 또는 서블릿으로 진행
+            filterChain.doFilter(request, response);
+        }
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+}