Skip to content

Commit

Permalink
[feat] : 회원 엔티티와 회원가입 api 구현 절반 / 패키지 구조 변경 (#20)
Browse files Browse the repository at this point in the history
* [refactor] : 패키지 구조 변

* [refactor] : 패키지 구조 변경

* [refactor] : 안쓰는 history 삭제

* [feat] : 암호화 엔티티 추

* [feat] : 서비스, 레포지토리, dto, validation 의존성 추가

* [refactor] : 안쓰는 레포 메서드 삭제

* [refactor] : 컨플릭 해결 - 머지하면서 기존 패키지가 남아있어서 지워줌
  • Loading branch information
ParkJuhan94 authored Feb 16, 2024
1 parent a658d4a commit 79e8551
Show file tree
Hide file tree
Showing 39 changed files with 282 additions and 157 deletions.
2 changes: 1 addition & 1 deletion api/src/main/java/dev/handsup/HandsUpApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ public static void main(String[] args) {
System.setProperty("spring.config.name", "application,application-core");
SpringApplication.run(HandsUpApplication.class, args);
}
}
}
1 change: 1 addition & 0 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-validation'
runtimeOnly 'com.mysql:mysql-connector-j'
testImplementation 'org.springframework.security:spring-security-test'
testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.handsup.domain.auction;
package dev.handsup.auction.domain;

import static dev.handsup.domain.auction.auction_field.AuctionStatus.*;
import static dev.handsup.auction.domain.auction_field.AuctionStatus.*;
import static jakarta.persistence.ConstraintMode.*;
import static jakarta.persistence.EnumType.*;
import static jakarta.persistence.FetchType.*;
Expand All @@ -9,15 +9,14 @@

import java.time.LocalDate;

import dev.handsup.auction.domain.auction_category.ProductCategory;
import dev.handsup.auction.domain.auction_field.AuctionStatus;
import dev.handsup.auction.domain.auction_field.Coordinate;
import dev.handsup.auction.domain.auction_field.ProductStatus;
import dev.handsup.auction.domain.auction_field.PurchaseTime;
import dev.handsup.auction.domain.auction_field.TradeMethod;
import dev.handsup.common.entity.TimeBaseEntity;
import dev.handsup.domain.auction.auction_category.ProductCategory;
import dev.handsup.domain.auction.auction_field.AuctionStatus;
import dev.handsup.domain.auction.auction_field.Coordinate;
import dev.handsup.domain.auction.auction_field.ProductStatus;
import dev.handsup.domain.auction.auction_field.PurchaseTime;
import dev.handsup.domain.auction.auction_field.TradeMethod;
import dev.handsup.domain.user.User;

import dev.handsup.user.domain.User;
import jakarta.persistence.Column;
import jakarta.persistence.Embedded;
import jakarta.persistence.Entity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package dev.handsup.domain.auction;
package dev.handsup.auction.domain;

import static jakarta.persistence.ConstraintMode.*;
import static jakarta.persistence.FetchType.*;
import static jakarta.persistence.GenerationType.*;
import static lombok.AccessLevel.*;

import dev.handsup.common.entity.TimeBaseEntity;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package dev.handsup.domain.auction.history;
package dev.handsup.auction.domain;

import static jakarta.persistence.ConstraintMode.*;
import static jakarta.persistence.FetchType.*;
import static jakarta.persistence.GenerationType.*;
import static lombok.AccessLevel.*;

import dev.handsup.auction.domain.Auction;
import dev.handsup.common.entity.TimeBaseEntity;
import dev.handsup.domain.auction.Auction;
import dev.handsup.domain.user.User;

import dev.handsup.user.domain.User;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package dev.handsup.domain.auction;
package dev.handsup.auction.domain;

import static jakarta.persistence.ConstraintMode.*;
import static jakarta.persistence.FetchType.*;
import static jakarta.persistence.GenerationType.*;
import static lombok.AccessLevel.*;

import dev.handsup.common.entity.TimeBaseEntity;
import dev.handsup.domain.user.User;

import dev.handsup.user.domain.User;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package dev.handsup.domain.auction;
package dev.handsup.auction.domain;

import static jakarta.persistence.ConstraintMode.*;
import static jakarta.persistence.FetchType.*;
import static jakarta.persistence.GenerationType.*;
import static lombok.AccessLevel.*;

import dev.handsup.common.entity.TimeBaseEntity;
import dev.handsup.domain.user.User;

import dev.handsup.user.domain.User;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.handsup.domain.auction.auction_category;
package dev.handsup.auction.domain.auction_category;

import static jakarta.persistence.GenerationType.*;
import static lombok.AccessLevel.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package dev.handsup.domain.auction.auction_category;
package dev.handsup.auction.domain.auction_category;

import static jakarta.persistence.ConstraintMode.*;
import static jakarta.persistence.FetchType.*;
import static jakarta.persistence.GenerationType.*;
import static lombok.AccessLevel.*;

import dev.handsup.common.entity.TimeBaseEntity;
import dev.handsup.domain.user.User;

import dev.handsup.user.domain.User;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.handsup.domain.auction.auction_category;
package dev.handsup.auction.domain.auction_category;

import lombok.Getter;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.handsup.domain.auction.auction_field;
package dev.handsup.auction.domain.auction_field;

import lombok.Getter;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.handsup.domain.auction.auction_field;
package dev.handsup.auction.domain.auction_field;

import static lombok.AccessLevel.*;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.handsup.domain.auction.auction_field;
package dev.handsup.auction.domain.auction_field;

import lombok.Getter;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.handsup.domain.auction.auction_field;
package dev.handsup.auction.domain.auction_field;

import lombok.Getter;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.handsup.domain.auction.auction_field;
package dev.handsup.auction.domain.auction_field;

import lombok.Getter;
import lombok.RequiredArgsConstructor;
Expand Down
18 changes: 18 additions & 0 deletions core/src/main/java/dev/handsup/auth/domain/BcryptImpl.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package dev.handsup.auth.domain;

import org.mindrot.jbcrypt.BCrypt;
import org.springframework.stereotype.Component;

@Component
public class BcryptImpl implements EncryptHelper {

@Override
public String encrypt(String plainPassword) {
return BCrypt.hashpw(plainPassword, BCrypt.gensalt());
}

@Override
public boolean isMatch(String plainPassword, String hashedPassword) {
return BCrypt.checkpw(plainPassword, hashedPassword);
}
}
6 changes: 6 additions & 0 deletions core/src/main/java/dev/handsup/auth/domain/EncryptHelper.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package dev.handsup.auth.domain;

public interface EncryptHelper {
String encrypt(String plainPassword);
boolean isMatch(String plainPassword, String hashedPassword);
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package dev.handsup.domain.chat;
package dev.handsup.chat.domain;

import static jakarta.persistence.ConstraintMode.*;
import static jakarta.persistence.FetchType.*;
import static jakarta.persistence.GenerationType.*;
import static lombok.AccessLevel.*;

import dev.handsup.common.entity.TimeBaseEntity;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package dev.handsup.domain.chat;
package dev.handsup.chat.domain;

import static jakarta.persistence.ConstraintMode.*;
import static jakarta.persistence.FetchType.*;
import static jakarta.persistence.GenerationType.*;
import static lombok.AccessLevel.*;

import dev.handsup.common.entity.TimeBaseEntity;
import dev.handsup.domain.user.User;

import dev.handsup.user.domain.User;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@ public abstract class TimeBaseEntity {

@LastModifiedDate
private LocalDateTime updatedAt;

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package dev.handsup.common.exception;

import static lombok.AccessLevel.*;

import lombok.NoArgsConstructor;

@NoArgsConstructor(access = PRIVATE)
public final class CommonValidationError {

private static final String NOT_NULL_POSTFIX = " 는 Null 이 될 수 없습니다";
private static final String NOT_EMPTY_POSTFIX = " 는 Empty 가 될 수 없습니다";

public static String getNotNullMessage(String object, String variable) {
return object + "_" + variable + NOT_NULL_POSTFIX;
}

public static String getNotEmptyMessage(String object, String variable) {
return object + "_" + variable + NOT_EMPTY_POSTFIX;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package dev.handsup.common.exception;

public interface ErrorCode {

String getMessage();

String getCode();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package dev.handsup.common.exception;

import lombok.Getter;

@Getter
public class NotFoundException extends RuntimeException {

private final String code;

public NotFoundException(ErrorCode errorCode) {
super(errorCode.getMessage());
this.code = errorCode.getCode();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package dev.handsup.common.exception;

import lombok.Getter;

@Getter
public class ValidationException extends RuntimeException {

private final String code;

public ValidationException(ErrorCode errorCode) {
super(errorCode.getMessage());
this.code = errorCode.getCode();
}
}

This file was deleted.

This file was deleted.

Loading

0 comments on commit 79e8551

Please sign in to comment.