Feat/#54 사업자 정보 검증 및 사장 회원가입 api 구현

build.gradle

@@ -33,7 +33,6 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
-
     // WEB SOCKET
     implementation 'org.springframework.boot:spring-boot-starter-websocket'
 
@@ -42,6 +41,7 @@ dependencies {
 
     // ENV
     implementation 'me.paulschwarz:spring-dotenv:4.0.0'
+
     // VALIDATION
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 
@@ -56,11 +56,21 @@ dependencies {
     implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
     // Query DSL
     implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
     annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
     annotationProcessor "jakarta.annotation:jakarta.annotation-api"
     annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
+    // OAUTH2
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+
+    // MOCKITO
+    testImplementation "org.mockito:mockito-core:3.+"
+
+    //WIREMOCK (외부 의존성 테스트용)
+    implementation 'org.wiremock.integrations:wiremock-spring-boot:3.3.0'
 
     // 인메모리 몽고디비 flapdoodle
     testImplementation 'de.flapdoodle.embed:de.flapdoodle.embed.mongo:4.6.0'
@@ -91,4 +101,4 @@ sourceSets {
             srcDirs = ['src/test/java']
         }
     }
-}
+}

gradlew

@@ -249,4 +249,4 @@ eval "set -- $(
         tr '\n' ' '
     )" '"$@"'
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"

src/main/generated/com/example/api/account/entity/QLocation.java

@@ -0,0 +1,43 @@
+package com.example.api.account.entity;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.processing.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QLocation is a Querydsl query type for Location
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QLocation extends EntityPathBase<Location> {
+
+    private static final long serialVersionUID = -590127238L;
+
+    public static final QLocation location = new QLocation("location");
+
+    public final StringPath address = createString("address");
+
+    public final StringPath detailAddress = createString("detailAddress");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath zipcode = createString("zipcode");
+
+    public QLocation(String variable) {
+        super(Location.class, forVariable(variable));
+    }
+
+    public QLocation(Path<? extends Location> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QLocation(PathMetadata metadata) {
+        super(Location.class, metadata);
+    }
+
+}
+

src/main/generated/com/example/api/domain/QBusiness.java

@@ -35,7 +35,7 @@ public class QBusiness extends EntityPathBase<Business> {
 
     public final QAccount employer;
 
-    public final StringPath location = createString("location");
+    public final com.example.api.account.entity.QLocation location;
 
     public final DatePath<java.time.LocalDate> openDate = createDate("openDate", java.time.LocalDate.class);
 
@@ -65,6 +65,7 @@ public QBusiness(PathMetadata metadata, PathInits inits) {
     public QBusiness(Class<? extends Business> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
         this.employer = inits.isInitialized("employer") ? new QAccount(forProperty("employer")) : null;
+        this.location = inits.isInitialized("location") ? new com.example.api.account.entity.QLocation(forProperty("location")) : null;
     }
 
 }

src/main/java/com/example/api/ApiApplication.java

@@ -8,9 +8,7 @@
 @SpringBootApplication
 @EnableJpaAuditing
 public class ApiApplication {
-
     public static void main(String[] args) {
-
         SpringApplication.run(ApiApplication.class, args);
     }
 }

src/main/java/com/example/api/account/controller/AccountController.java

@@ -1,16 +1,17 @@
 package com.example.api.account.controller;
 
-import com.example.api.account.dto.EmailCodeRequest;
-import com.example.api.account.dto.EmailRequest;
+import com.example.api.account.dto.*;
 import com.example.api.account.entity.Code;
 import com.example.api.account.service.AccountService;
-import com.example.api.account.dto.SignUpRequest;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URISyntaxException;
+
 @RestController
 @RequestMapping("/api/v1/account")
 @RequiredArgsConstructor
@@ -30,9 +31,21 @@ public ResponseEntity<String> verifyEmail(@Valid @RequestBody final EmailCodeReq
         return ResponseEntity.ok(successMessage);
     }
 
-    @PostMapping("/sign-up")
-    public ResponseEntity<String> signUp(@Valid @RequestBody final SignUpRequest request) {
-        String successMessage = signUpService.signUp(request);
+    @PostMapping("/sign-up/employee")
+    public ResponseEntity<String> signUpEmployee(@Valid @RequestBody final SignUpEmployeeRequest request) {
+        String successMessage = signUpService.signUpEmployee(request);
+        return ResponseEntity.status(HttpStatus.CREATED).body(successMessage);
+    }
+
+    @PostMapping("/validation/business-number")
+    public ResponseEntity<String> verifyBusinessNumber(@Valid @RequestBody final BusinessNumberRequest request) {
+        String successMessage = signUpService.verifyBusinessNumber(request);
+        return ResponseEntity.ok(successMessage);
+    }
+
+    @PostMapping("/sign-up/employer")
+    public ResponseEntity<String> signUpEmployer(@Valid @RequestBody final SignUpEmployerRequest request) {
+        String successMessage = signUpService.signUpEmployer(request);
         return ResponseEntity.status(HttpStatus.CREATED).body(successMessage);
     }
 }

src/main/java/com/example/api/account/dto/BusinessNumberRequest.java

@@ -0,0 +1,14 @@
+package com.example.api.account.dto;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record BusinessNumberRequest(
+        @NotBlank
+        String businessRegistrationNumber,
+        @NotBlank
+        String businessName,
+        @NotBlank
+        String representationName,
+        @NotBlank
+        String businessOpenDate) {
+}

src/main/java/com/example/api/account/dto/BusinessNumberResponse.java

@@ -0,0 +1,46 @@
+package com.example.api.account.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+
+public record BusinessNumberResponse(
+        @JsonProperty("request_cnt") int requestCount,
+        @JsonProperty("valid_cnt") int validCount,
+        @JsonProperty("status_code") String statusCode,
+        List<Data> data
+) {
+    private record Data(
+            @JsonProperty("b_no") String businessNumber,
+            String valid,
+            @JsonProperty("request_param") RequestParam requestParam,
+            Status status
+    ) {
+    }
+    private record RequestParam(
+            @JsonProperty("b_no") String businessNumber,
+            @JsonProperty("start_dt") String startDate,
+            @JsonProperty("p_nm") String name,
+            @JsonProperty("b_nm") String businessName
+    ) {
+    }
+    private record Status(
+            @JsonProperty("b_no") String businessNumber,
+            @JsonProperty("b_stt") String businessStatus,
+            @JsonProperty("b_stt_cd") String businessStatusCode,
+            @JsonProperty("tax_type") String taxType,
+            @JsonProperty("tax_type_cd") String taxTypeCode,
+            @JsonProperty("end_dt") String endDate,
+            @JsonProperty("utcc_yn") String utccYn,
+            @JsonProperty("tax_type_change_dt") String taxTypeChangeDate,
+            @JsonProperty("invoice_apply_dt") String invoiceApplyDate,
+            @JsonProperty("rbf_tax_type") String rbfTaxType,
+            @JsonProperty("rbf_tax_type_cd") String rbfTaxTypeCode
+    ) {
+    }
+
+    public String getValid(){
+        return data.get(0).valid;
+    }
+}

src/main/java/com/example/api/account/dto/SignUpRequest.java → src/main/java/com/example/api/account/dto/SignUpEmployeeRequest.java

@@ -3,11 +3,10 @@
 import com.example.api.account.entity.Nationality;
 import com.example.api.account.entity.UserRole;
 import com.example.api.global.config.resolver.ValidEmail;
-import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 
-public record SignUpRequest(
+public record SignUpEmployeeRequest(
     @NotBlank
     String loginId,
     @NotBlank

src/main/java/com/example/api/account/dto/SignUpEmployerRequest.java

@@ -0,0 +1,34 @@
+package com.example.api.account.dto;
+
+import com.example.api.account.entity.Location;
+import com.example.api.account.entity.Nationality;
+import com.example.api.account.entity.UserRole;
+import com.example.api.global.config.resolver.ValidEmail;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+
+public record SignUpEmployerRequest(
+    @NotBlank
+    String loginId,    // 로그인 id
+    @NotBlank
+    String password,    // 비밀번호
+    @ValidEmail
+    String email,   // 이메일
+    @NotBlank
+    String businessRegistrationNumber,  // 사업자 번호
+    @NotBlank
+    String businessName,    // 회사명
+    @NotBlank
+    String representationName,  // 대표명
+    @NotBlank
+    String businessOpenDate,    // 개업연월일
+    @NotNull
+    Location location,
+    @NotNull
+    Nationality nationality,    // 국적
+    @NotNull
+    UserRole role,     // 권한
+    @NotBlank
+    String phoneNumber   // 휴대폰 번호
+) {
+}

src/main/java/com/example/api/account/entity/Location.java

@@ -0,0 +1,28 @@
+package com.example.api.account.entity;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+
+@Entity
+@Getter
+public class Location {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "LOCATION_UNIQUE_ID")
+    private Long id;
+    @Column(name = "LOCATION_ZIPCODE")
+    private String zipcode;
+    @Column(name = "LOCATION_ADDRESS")
+    private String address;
+    @Column(name = "LOCATION_DETAIL_ADDRESS")
+    private String detailAddress;
+
+    public Location() {
+    }
+
+    public Location(String zipcode, String address, String detailAddress) {
+        this.zipcode = zipcode;
+        this.address = address;
+        this.detailAddress = detailAddress;
+    }
+}

src/main/java/com/example/api/account/entity/UserRole.java

@@ -1,6 +1,11 @@
 package com.example.api.account.entity;
 
-public enum UserRole {
+import com.example.api.exception.BusinessException;
+import com.example.api.exception.ErrorCode;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.springframework.security.core.GrantedAuthority;
+
+public enum UserRole implements GrantedAuthority {
     EMPLOYEE(0, "알바생"),
     EMPLOYER(1, "사장");
 
@@ -21,6 +26,16 @@ public static UserRole of(final Integer code) {
         return null;
     }
 
+    @JsonCreator
+    public static UserRole from(String value) {
+        for (UserRole role : values()) {
+            if (role.name().equalsIgnoreCase(value)) {
+                return role;
+            }
+        }
+        throw new BusinessException(ErrorCode.INCORRECT_DATA);
+    }
+
     public Integer getCode() {
         return code;
     }

src/main/java/com/example/api/account/repository/AccountRepository.java

@@ -1,12 +1,19 @@
 package com.example.api.account.repository;
 
 import com.example.api.domain.Account;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.Optional;
 
 public interface AccountRepository extends JpaRepository<Account, Long> {
     boolean existsByLoginId(String loginId);
 
     boolean existsByEmail(String email);
+
+    @EntityGraph(attributePaths = "roles")
+    Optional<Account> findByEmail(String email);
+
+    Optional<Account> findUserByLoginId(String loginId);
 }

src/main/java/com/example/api/account/repository/LocationRepository.java

@@ -0,0 +1,9 @@
+package com.example.api.account.repository;
+
+import com.example.api.account.entity.Location;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface LocationRepository extends JpaRepository<Location, Long> {
+}