[종근] 배민찬 3단계(프로모션) 구현 완료 + 1~3단계 프론트 구현

.travis.yml

@@ -0,0 +1,63 @@
+language: java
+jdk:
+  - openjdk8
+
+branches:
+  only:
+    - econo-jonggeun
+
+before_install:
+  - chmod +x mvnw
+
+install:
+  -
+  - "./mvnw clean install"
+
+# Travis CI 서버의 Home
+cache:
+  directories:
+    - .autoconf
+    - $HOME/.m2
+
+script:
+
+  - "./mvnw clean package"
+
+before_deploy:
+  - zip -r baeminchan *
+  - mkdir -p deploy
+  - mv baeminchan.zip deploy/baeminchan.zip
+
+deploy:
+  - provider: s3
+    local_dir: deploy # before_deploy에서 생성한 디렉토리
+    access_key_id: $AWS_ACCESS_KEY # Travis repo settings에 설정된 값
+    secret_access_key: $AWS_SECRET_KEY # Travis repo settings에 설정된 값
+    bucket: baeminchan-deploy # 6-3-3에서 생성한 S3 버킷
+    region: ap-northeast-2
+    skip_cleanup: true
+    acl: public_read
+    wait-until-deployed: true
+    on:
+      repo: Bellroute/baeminchan #Github 주소
+      branch: econo-jonggeun
+
+  - provider: codedeploy
+    access_key_id: $AWS_ACCESS_KEY # Travis repo settings에 설정된 값
+    secret_access_key: $AWS_SECRET_KEY # Travis repo settings에 설정된 값
+    bucket: baeminchan-deploy # S3 버킷
+    key: baeminchan.zip # 빌드 파일을 압축해서 전달
+    bundle_type: zip
+    application: baeminchan # 웹 콘솔에서 등록한 CodeDeploy 어플리케이션
+    deployment_group: baeminchan-group # 웹 콘솔에서 등록한 CodeDeploy 배포 그룹
+    region: ap-northeast-2
+    wait-until-deployed: true
+    on:
+      repo: Bellroute/baeminchan
+      branch: econo-jonggeun
+
+# CI 실행 완료시 메일로 알람
+notifications:
+  email:
+    recipients:
+      - [email protected]

appspec.yml

@@ -0,0 +1,10 @@
+version: 0.0
+os: linux
+files:
+  - source:  /
+    destination: /home/ec2-user/app/travis/build/
+
+hooks:
+  AfterInstall: # 배포가 끝나면 아래 명령어를 실행
+    - location: execute-deploy.sh
+      timeout: 180

execute-deploy.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+/home/ec2-user/app/travis/deploy.sh > /dev/null 2> /dev/null < /dev/null &

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>kr.codesquad</groupId>
 	<artifactId>baeminchan</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 	<packaging>jar</packaging>
 
 	<name>baeminchan</name>
@@ -43,6 +43,11 @@
 			<artifactId>h2</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>8.0.17</version>
+		</dependency>
 		<dependency>
 			<groupId>net.rakugakibox.spring.boot</groupId>
 			<artifactId>logback-access-spring-boot-starter</artifactId>
@@ -70,7 +75,12 @@
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 			<version>1.18.0</version>
-			<scope>provided</scope>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>

src/main/java/codesquad/config/WebMvcConfig.java

@@ -1,16 +1,52 @@
 package codesquad.config;
 
 import codesquad.interceptor.AdminInterceptor;
+import codesquad.sequrity.BasicAuthInterceptor;
+import codesquad.sequrity.LoginUserHandlerMethodArgumentResolver;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import java.util.List;
+
 @Configuration
-public class WebMvcConfig implements WebMvcConfigurer {
+public abstract class WebMvcConfig implements WebMvcConfigurer {
 
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(new AdminInterceptor())
                 .addPathPatterns("/admin/**");
     }
+
+    @Bean
+    public LoginUserHandlerMethodArgumentResolver loginUserArgumentResolver() {
+        return new LoginUserHandlerMethodArgumentResolver();
+    }
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
+        argumentResolvers.add(loginUserArgumentResolver());
+    }
+
+    @Configuration
+    @Profile({ "test" })
+    static class TestWebMvcConfig extends WebMvcConfig {
+        @Bean
+        public BasicAuthInterceptor basicAuthInterceptor() {
+            return new BasicAuthInterceptor();
+        }
+
+        @Override
+        public void addInterceptors(InterceptorRegistry registry) {
+            registry.addInterceptor(basicAuthInterceptor());
+        }
+    }
+
+    @Configuration
+    @Profile({ "local", "dev", "prod" })
+    static class NotTestWebMvcConfig extends WebMvcConfig {
+    }
 }

src/main/java/codesquad/domain/Account.java

@@ -11,6 +11,7 @@
 import static codesquad.domain.AccountType.USER;
 
 @Entity
+@Table(name = "account")
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor
@@ -27,7 +28,7 @@ public class Account {
     @Column(nullable = false, name = "password")
     private String password;
 
-    @Column(nullable = false, name = "name")
+    @Column(nullable = false, name = "user_name")
     private String name;
 
     @Column(nullable = false, name = "phone_number")
@@ -106,4 +107,12 @@ public String toString() {
     public boolean isAdmin() {
         return this.accountType.equals(ADMIN);
     }
+
+    public boolean hasSamePhoneNumber(String phoneNumber) {
+        return this.phoneNumber.equals(phoneNumber);
+    }
+
+    public boolean hasSameName(String name) {
+        return this.name.equals(name);
+    }
 }

src/main/java/codesquad/domain/AccountRepository.java

@@ -9,4 +9,5 @@
 public interface AccountRepository extends JpaRepository<Account, Long> {
 
     Optional<Account> findByEmail(String accountId);
+    Optional<Account> findByName(String name);
 }

src/main/java/codesquad/domain/Category.java

@@ -1,5 +1,6 @@
 package codesquad.domain;
 
+import codesquad.dto.CategoryDTO;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -12,6 +13,7 @@
 import java.util.stream.Collectors;
 
 @Entity
+@Table(name = "category")
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor
@@ -34,6 +36,7 @@ public class Category {
     @Where(clause = "deleted='false'")
     @OneToMany(fetch = FetchType.LAZY)
     @JoinColumn(name = "parentId", nullable = true)
+    @JsonIgnore
     private List<Category> children = new ArrayList<>();
 
     @Column(name = "deleted", nullable = false)
@@ -75,11 +78,6 @@ public void setParent(Category parent) {
         this.parent = parent;
     }
 
-    public List<Category> getChildrenExceptDeleted() {
-        return this.children.stream()
-                .filter(child -> !child.isDeleted()).collect(Collectors.toList());
-    }
-
     public void delete() {
         this.deleted = true;
     }
@@ -115,4 +113,17 @@ private boolean isSame(Category category) {
     public void update(String title) {
         this.title = title;
     }
+
+    public CategoryDTO changeToDTO() {
+        return new CategoryDTO(this.title, this.parent.getId());
+    }
+
+    public Category createDefaultCategory(String defaultMenuTitle) {
+        this.id = 9999l;
+        this.title = defaultMenuTitle;
+        this.parent = null;
+        this.children = null;
+
+        return this.build();
+    }
 }

src/main/java/codesquad/domain/Promotion.java

@@ -0,0 +1,39 @@
+package codesquad.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "promotion")
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+public class Promotion {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    @Column(nullable = false, name = "promotion_type")
+    @Enumerated(EnumType.STRING)
+    private PromotionType type;
+
+    @Column(nullable = false, name = "title")
+    private String title;
+
+    @Column(nullable = false, name = "description")
+    private String describe;
+
+    @Column(nullable = false, name = "original_price")
+    private int originalPrice;
+
+    @Column(nullable = false, name = "final_price")
+    private int finalPrice;
+
+    public boolean isType(PromotionType promotionType) {
+        return this.type == promotionType;
+    }
+}

src/main/java/codesquad/domain/PromotionRepository.java

@@ -0,0 +1,8 @@
+package codesquad.domain;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PromotionRepository extends JpaRepository<Promotion, Long> {
+}

src/main/java/codesquad/domain/PromotionType.java

@@ -0,0 +1,5 @@
+package codesquad.domain;
+
+public enum PromotionType {
+    SUB_DISH, MAIN_DISH, SOUP_AND_STEW
+}

src/main/java/codesquad/dto/FindingEmailDTO.java

@@ -0,0 +1,23 @@
+package codesquad.dto;
+
+import codesquad.utils.RegexUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class FindingEmailDTO {
+
+    @NotBlank
+    private String name;
+
+    @Pattern(regexp = RegexUtil.REGEX_PHONE_NUMBER)
+    private String phoneNumber;
+}

src/main/java/codesquad/dto/FindingPasswordDTO.java

@@ -0,0 +1,26 @@
+package codesquad.dto;
+
+import codesquad.utils.RegexUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class FindingPasswordDTO {
+
+    @NotBlank
+    String email;
+
+    @NotBlank
+    String name;
+
+    @Pattern(regexp = RegexUtil.REGEX_PHONE_NUMBER)
+    String phoneNumber;
+}

src/main/java/codesquad/exception/UnAuthorizedException.java

@@ -0,0 +1,6 @@
+package codesquad.exception;
+
+public class UnAuthorizedException extends RuntimeException {
+    public UnAuthorizedException(String s) {
+    }
+}

src/main/java/codesquad/interceptor/AdminInterceptor.java

@@ -2,7 +2,7 @@
 
 import codesquad.domain.Account;
 import codesquad.exception.NotAdminException;
-import codesquad.utils.SessionUtil;
+import codesquad.sequrity.HttpSessionUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
@@ -15,13 +15,13 @@ public class AdminInterceptor extends HandlerInterceptorAdapter {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         log.info("-------------------------log-----------------------------");
-        log.info("session info: {}", request.getSession().getAttribute(SessionUtil.SESSIONED_USER));
+        log.info("session info: {}", request.getSession().getAttribute(HttpSessionUtils.SESSIONED_USER));
 
-        Object session = request.getSession().getAttribute(SessionUtil.SESSIONED_USER);
+        Object session = request.getSession().getAttribute(HttpSessionUtils.SESSIONED_USER);
         Account sessionedAccount = (Account) session;
 
         if (sessionedAccount == null) {
-            response.sendRedirect("/login");
+            response.sendRedirect("/member/login");
 
             return false;
         }