Merge branch 'issue/29' into develop

Winey-API/src/main/java/com/example/wineyapi/user/service/UserServiceImpl.java

@@ -141,7 +141,7 @@ public VerificationMessage sendCode(Long userId, UserRequest.SendCodeDTO request
         if(optionalUser.isPresent() && optionalUser.get().getStatus() == Status.ACTIVE) {
             // 0. 1~2를 수행한 소셜로그인 계정 hard delete & 안내문구전송
             User user = optionalUser.get();
-            String errorMessageWithSocialType = user.getPhoneNumber() + "님은 " + user.getSocialType().name() + " 소셜 회원으로 가입하신 기록이 있어요";
+            String errorMessageWithSocialType = user.getPhoneNumber() + "님은\n" + user.getSocialType().name() + " 소셜 회원으로\n가입하신 기록이 있어요";
             userRepository.deleteById(userId);
             throw new UserException(CommonResponseStatus.USER_ALREADY_EXISTS, errorMessageWithSocialType);
         }

Winey-Domain/src/main/generated/com/example/wineydomain/badge/entity/QUserWineBadge.java

@@ -0,0 +1,62 @@
+package com.example.wineydomain.badge.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;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QUserWineBadge is a Querydsl query type for UserWineBadge
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QUserWineBadge extends EntityPathBase<UserWineBadge> {
+
+    private static final long serialVersionUID = 618174714L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QUserWineBadge userWineBadge = new QUserWineBadge("userWineBadge");
+
+    public final com.example.wineydomain.common.model.QBaseEntity _super = new com.example.wineydomain.common.model.QBaseEntity(this);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
+
+    public final com.example.wineydomain.user.entity.QUser user;
+
+    public final QWineBadge wineBadge;
+
+    public QUserWineBadge(String variable) {
+        this(UserWineBadge.class, forVariable(variable), INITS);
+    }
+
+    public QUserWineBadge(Path<? extends UserWineBadge> path) {
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
+    }
+
+    public QUserWineBadge(PathMetadata metadata) {
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QUserWineBadge(PathMetadata metadata, PathInits inits) {
+        this(UserWineBadge.class, metadata, inits);
+    }
+
+    public QUserWineBadge(Class<? extends UserWineBadge> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.user = inits.isInitialized("user") ? new com.example.wineydomain.user.entity.QUser(forProperty("user"), inits.get("user")) : null;
+        this.wineBadge = inits.isInitialized("wineBadge") ? new QWineBadge(forProperty("wineBadge")) : null;
+    }
+
+}
+

Winey-Domain/src/main/generated/com/example/wineydomain/badge/entity/QWineBadge.java

@@ -0,0 +1,49 @@
+package com.example.wineydomain.badge.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;
+
+
+/**
+ * QWineBadge is a Querydsl query type for WineBadge
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QWineBadge extends EntityPathBase<WineBadge> {
+
+    private static final long serialVersionUID = -1274364411L;
+
+    public static final QWineBadge wineBadge = new QWineBadge("wineBadge");
+
+    public final com.example.wineydomain.common.model.QBaseEntity _super = new com.example.wineydomain.common.model.QBaseEntity(this);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
+
+    public final StringPath description = createString("description");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath name = createString("name");
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
+
+    public QWineBadge(String variable) {
+        super(WineBadge.class, forVariable(variable));
+    }
+
+    public QWineBadge(Path<? extends WineBadge> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QWineBadge(PathMetadata metadata) {
+        super(WineBadge.class, metadata);
+    }
+
+}
+

Winey-Domain/src/main/generated/com/example/wineydomain/common/model/QBaseEntity.java

@@ -0,0 +1,39 @@
+package com.example.wineydomain.common.model;
+
+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;
+
+
+/**
+ * QBaseEntity is a Querydsl query type for BaseEntity
+ */
+@Generated("com.querydsl.codegen.DefaultSupertypeSerializer")
+public class QBaseEntity extends EntityPathBase<BaseEntity> {
+
+    private static final long serialVersionUID = 567452337L;
+
+    public static final QBaseEntity baseEntity = new QBaseEntity("baseEntity");
+
+    public final DateTimePath<java.time.LocalDateTime> createdAt = createDateTime("createdAt", java.time.LocalDateTime.class);
+
+    public final DateTimePath<java.time.LocalDateTime> updatedAt = createDateTime("updatedAt", java.time.LocalDateTime.class);
+
+    public QBaseEntity(String variable) {
+        super(BaseEntity.class, forVariable(variable));
+    }
+
+    public QBaseEntity(Path<? extends BaseEntity> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QBaseEntity(PathMetadata metadata) {
+        super(BaseEntity.class, metadata);
+    }
+
+}
+

Winey-Domain/src/main/generated/com/example/wineydomain/image/entity/QImage.java

@@ -0,0 +1,47 @@
+package com.example.wineydomain.image.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;
+
+
+/**
+ * QImage is a Querydsl query type for Image
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QImage extends EntityPathBase<Image> {
+
+    private static final long serialVersionUID = -1600718578L;
+
+    public static final QImage image = new QImage("image");
+
+    public final com.example.wineydomain.common.model.QBaseEntity _super = new com.example.wineydomain.common.model.QBaseEntity(this);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
+
+    public final StringPath url = createString("url");
+
+    public QImage(String variable) {
+        super(Image.class, forVariable(variable));
+    }
+
+    public QImage(Path<? extends Image> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QImage(PathMetadata metadata) {
+        super(Image.class, metadata);
+    }
+
+}
+

Winey-Domain/src/main/generated/com/example/wineydomain/image/entity/QTastingNoteImage.java

@@ -0,0 +1,61 @@
+package com.example.wineydomain.image.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;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QTastingNoteImage is a Querydsl query type for TastingNoteImage
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QTastingNoteImage extends EntityPathBase<TastingNoteImage> {
+
+    private static final long serialVersionUID = 929937858L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QTastingNoteImage tastingNoteImage = new QTastingNoteImage("tastingNoteImage");
+
+    public final com.example.wineydomain.common.model.QBaseEntity _super = new com.example.wineydomain.common.model.QBaseEntity(this);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final com.example.wineydomain.tastingNote.entity.QTastingNote tastingNote;
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
+
+    public final StringPath url = createString("url");
+
+    public QTastingNoteImage(String variable) {
+        this(TastingNoteImage.class, forVariable(variable), INITS);
+    }
+
+    public QTastingNoteImage(Path<? extends TastingNoteImage> path) {
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
+    }
+
+    public QTastingNoteImage(PathMetadata metadata) {
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QTastingNoteImage(PathMetadata metadata, PathInits inits) {
+        this(TastingNoteImage.class, metadata, inits);
+    }
+
+    public QTastingNoteImage(Class<? extends TastingNoteImage> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.tastingNote = inits.isInitialized("tastingNote") ? new com.example.wineydomain.tastingNote.entity.QTastingNote(forProperty("tastingNote"), inits.get("tastingNote")) : null;
+    }
+
+}
+

Winey-Domain/src/main/generated/com/example/wineydomain/image/entity/QWineBadgeImage.java

@@ -0,0 +1,63 @@
+package com.example.wineydomain.image.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;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QWineBadgeImage is a Querydsl query type for WineBadgeImage
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QWineBadgeImage extends EntityPathBase<WineBadgeImage> {
+
+    private static final long serialVersionUID = -1567462898L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QWineBadgeImage wineBadgeImage1 = new QWineBadgeImage("wineBadgeImage1");
+
+    public final QImage _super = new QImage(this);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
+
+    //inherited
+    public final NumberPath<Long> id = _super.id;
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
+
+    //inherited
+    public final StringPath url = _super.url;
+
+    public final com.example.wineydomain.badge.entity.QWineBadge wineBadgeImage;
+
+    public QWineBadgeImage(String variable) {
+        this(WineBadgeImage.class, forVariable(variable), INITS);
+    }
+
+    public QWineBadgeImage(Path<? extends WineBadgeImage> path) {
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
+    }
+
+    public QWineBadgeImage(PathMetadata metadata) {
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QWineBadgeImage(PathMetadata metadata, PathInits inits) {
+        this(WineBadgeImage.class, metadata, inits);
+    }
+
+    public QWineBadgeImage(Class<? extends WineBadgeImage> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.wineBadgeImage = inits.isInitialized("wineBadgeImage") ? new com.example.wineydomain.badge.entity.QWineBadge(forProperty("wineBadgeImage")) : null;
+    }
+
+}
+

Winey-Domain/src/main/generated/com/example/wineydomain/image/entity/QWineImage.java

@@ -0,0 +1,63 @@
+package com.example.wineydomain.image.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;
+import com.querydsl.core.types.dsl.PathInits;
+
+
+/**
+ * QWineImage is a Querydsl query type for WineImage
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QWineImage extends EntityPathBase<WineImage> {
+
+    private static final long serialVersionUID = 1113646341L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QWineImage wineImage = new QWineImage("wineImage");
+
+    public final QImage _super = new QImage(this);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
+
+    //inherited
+    public final NumberPath<Long> id = _super.id;
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
+
+    //inherited
+    public final StringPath url = _super.url;
+
+    public final com.example.wineydomain.wine.entity.QWine wine;
+
+    public QWineImage(String variable) {
+        this(WineImage.class, forVariable(variable), INITS);
+    }
+
+    public QWineImage(Path<? extends WineImage> path) {
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
+    }
+
+    public QWineImage(PathMetadata metadata) {
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QWineImage(PathMetadata metadata, PathInits inits) {
+        this(WineImage.class, metadata, inits);
+    }
+
+    public QWineImage(Class<? extends WineImage> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.wine = inits.isInitialized("wine") ? new com.example.wineydomain.wine.entity.QWine(forProperty("wine")) : null;
+    }
+
+}
+