Merge pull request #137 from Gamegoo-repo/fix/135

[Fix/135] 매칭 관련 API 리팩토링 및 수정

.github/workflows/gradle.yml

@@ -84,6 +84,8 @@ jobs:
             sudo docker pull rimi3226/gamegoo:${{ github.sha }}
             sudo docker stop gamegoo_api
             sudo docker rm gamegoo_api
+            sudo docker rm $(docker ps -a -q -f status=exited)
+            sudo docker image prune -a
             sudo docker run -it -d -p 8080:8080 --name gamegoo_api \
               -e JAVA_OPTS="-Duser.timezone=Asia/Seoul" \
               rimi3226/gamegoo:${{ github.sha }}

src/main/generated/com/gamegoo/domain/QBlock.java

@@ -24,9 +24,9 @@ public class QBlock extends EntityPathBase<Block> {
 
     public final com.gamegoo.domain.common.QBaseDateTimeEntity _super = new com.gamegoo.domain.common.QBaseDateTimeEntity(this);
 
-    public final QMember blockedMember;
+    public final com.gamegoo.domain.member.QMember blockedMember;
 
-    public final QMember blockerMember;
+    public final com.gamegoo.domain.member.QMember blockerMember;
 
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
@@ -54,8 +54,8 @@ public QBlock(PathMetadata metadata, PathInits inits) {
 
     public QBlock(Class<? extends Block> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
-        this.blockedMember = inits.isInitialized("blockedMember") ? new QMember(forProperty("blockedMember")) : null;
-        this.blockerMember = inits.isInitialized("blockerMember") ? new QMember(forProperty("blockerMember")) : null;
+        this.blockedMember = inits.isInitialized("blockedMember") ? new com.gamegoo.domain.member.QMember(forProperty("blockedMember")) : null;
+        this.blockerMember = inits.isInitialized("blockerMember") ? new com.gamegoo.domain.member.QMember(forProperty("blockerMember")) : null;
     }
 
 }

src/main/generated/com/gamegoo/domain/QMatchingRecord.java

@@ -33,9 +33,11 @@ public class QMatchingRecord extends EntityPathBase<MatchingRecord> {
 
     public final NumberPath<Integer> mainPosition = createNumber("mainPosition", Integer.class);
 
+    public final NumberPath<Integer> mannerLevel = createNumber("mannerLevel", Integer.class);
+
     public final StringPath matchingType = createString("matchingType");
 
-    public final QMember member;
+    public final com.gamegoo.domain.Member.QMember member;
 
     public final BooleanPath mike = createBoolean("mike");
 
@@ -45,7 +47,7 @@ public class QMatchingRecord extends EntityPathBase<MatchingRecord> {
 
     public final NumberPath<Integer> subPosition = createNumber("subPosition", Integer.class);
 
-    public final StringPath tier = createString("tier");
+    public final EnumPath<com.gamegoo.domain.Member.Tier> tier = createEnum("tier", com.gamegoo.domain.Member.Tier.class);
 
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
@@ -72,7 +74,7 @@ public QMatchingRecord(PathMetadata metadata, PathInits inits) {
 
     public QMatchingRecord(Class<? extends MatchingRecord> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
-        this.member = inits.isInitialized("member") ? new QMember(forProperty("member")) : null;
+        this.member = inits.isInitialized("member") ? new com.gamegoo.domain.Member.QMember(forProperty("member")) : null;
     }
 
 }

src/main/generated/com/gamegoo/domain/board/QBoard.java

@@ -37,7 +37,7 @@ public class QBoard extends EntityPathBase<Board> {
 
     public final NumberPath<Integer> mainPosition = createNumber("mainPosition", Integer.class);
 
-    public final com.gamegoo.domain.QMember member;
+    public final com.gamegoo.domain.member.QMember member;
 
     public final BooleanPath mike = createBoolean("mike");
 
@@ -68,7 +68,7 @@ public QBoard(PathMetadata metadata, PathInits inits) {
 
     public QBoard(Class<? extends Board> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
-        this.member = inits.isInitialized("member") ? new com.gamegoo.domain.QMember(forProperty("member")) : null;
+        this.member = inits.isInitialized("member") ? new com.gamegoo.domain.member.QMember(forProperty("member")) : null;
     }
 
 }

src/main/generated/com/gamegoo/domain/champion/QMemberChampion.java

@@ -31,7 +31,7 @@ public class QMemberChampion extends EntityPathBase<MemberChampion> {
 
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
-    public final com.gamegoo.domain.QMember member;
+    public final com.gamegoo.domain.member.QMember member;
 
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
@@ -55,7 +55,7 @@ public QMemberChampion(PathMetadata metadata, PathInits inits) {
     public QMemberChampion(Class<? extends MemberChampion> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
         this.champion = inits.isInitialized("champion") ? new QChampion(forProperty("champion")) : null;
-        this.member = inits.isInitialized("member") ? new com.gamegoo.domain.QMember(forProperty("member")) : null;
+        this.member = inits.isInitialized("member") ? new com.gamegoo.domain.member.QMember(forProperty("member")) : null;
     }
 
 }

src/main/generated/com/gamegoo/domain/chat/QChat.java

@@ -31,13 +31,13 @@ public class QChat extends EntityPathBase<Chat> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
 
-    public final com.gamegoo.domain.QMember fromMember;
+    public final com.gamegoo.domain.member.QMember fromMember;
 
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
     public final NumberPath<Long> timestamp = createNumber("timestamp", Long.class);
 
-    public final com.gamegoo.domain.QMember toMember;
+    public final com.gamegoo.domain.member.QMember toMember;
 
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
@@ -61,8 +61,8 @@ public QChat(PathMetadata metadata, PathInits inits) {
     public QChat(Class<? extends Chat> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
         this.chatroom = inits.isInitialized("chatroom") ? new QChatroom(forProperty("chatroom"), inits.get("chatroom")) : null;
-        this.fromMember = inits.isInitialized("fromMember") ? new com.gamegoo.domain.QMember(forProperty("fromMember")) : null;
-        this.toMember = inits.isInitialized("toMember") ? new com.gamegoo.domain.QMember(forProperty("toMember")) : null;
+        this.fromMember = inits.isInitialized("fromMember") ? new com.gamegoo.domain.member.QMember(forProperty("fromMember")) : null;
+        this.toMember = inits.isInitialized("toMember") ? new com.gamegoo.domain.member.QMember(forProperty("toMember")) : null;
     }
 
 }

src/main/generated/com/gamegoo/domain/chat/QChatroom.java

@@ -29,7 +29,7 @@ public class QChatroom extends EntityPathBase<Chatroom> {
 
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
-    public final com.gamegoo.domain.QMember startMember;
+    public final com.gamegoo.domain.member.QMember startMember;
 
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
@@ -54,7 +54,7 @@ public QChatroom(PathMetadata metadata, PathInits inits) {
 
     public QChatroom(Class<? extends Chatroom> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
-        this.startMember = inits.isInitialized("startMember") ? new com.gamegoo.domain.QMember(forProperty("startMember")) : null;
+        this.startMember = inits.isInitialized("startMember") ? new com.gamegoo.domain.member.QMember(forProperty("startMember")) : null;
     }
 
 }

src/main/generated/com/gamegoo/domain/chat/QMemberChatroom.java

@@ -35,7 +35,7 @@ public class QMemberChatroom extends EntityPathBase<MemberChatroom> {
 
     public final DateTimePath<java.time.LocalDateTime> lastViewDate = createDateTime("lastViewDate", java.time.LocalDateTime.class);
 
-    public final com.gamegoo.domain.QMember member;
+    public final com.gamegoo.domain.member.QMember member;
 
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
@@ -59,7 +59,7 @@ public QMemberChatroom(PathMetadata metadata, PathInits inits) {
     public QMemberChatroom(Class<? extends MemberChatroom> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
         this.chatroom = inits.isInitialized("chatroom") ? new QChatroom(forProperty("chatroom"), inits.get("chatroom")) : null;
-        this.member = inits.isInitialized("member") ? new com.gamegoo.domain.QMember(forProperty("member")) : null;
+        this.member = inits.isInitialized("member") ? new com.gamegoo.domain.member.QMember(forProperty("member")) : null;
     }
 
 }

src/main/generated/com/gamegoo/domain/friend/QFriend.java

@@ -27,13 +27,13 @@ public class QFriend extends EntityPathBase<Friend> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
 
-    public final com.gamegoo.domain.QMember fromMember;
+    public final com.gamegoo.domain.member.QMember fromMember;
 
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
     public final BooleanPath isLiked = createBoolean("isLiked");
 
-    public final com.gamegoo.domain.QMember toMember;
+    public final com.gamegoo.domain.member.QMember toMember;
 
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
@@ -56,8 +56,8 @@ public QFriend(PathMetadata metadata, PathInits inits) {
 
     public QFriend(Class<? extends Friend> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
-        this.fromMember = inits.isInitialized("fromMember") ? new com.gamegoo.domain.QMember(forProperty("fromMember")) : null;
-        this.toMember = inits.isInitialized("toMember") ? new com.gamegoo.domain.QMember(forProperty("toMember")) : null;
+        this.fromMember = inits.isInitialized("fromMember") ? new com.gamegoo.domain.member.QMember(forProperty("fromMember")) : null;
+        this.toMember = inits.isInitialized("toMember") ? new com.gamegoo.domain.member.QMember(forProperty("toMember")) : null;
     }
 
 }

src/main/generated/com/gamegoo/domain/friend/QFriendRequests.java

@@ -27,13 +27,13 @@ public class QFriendRequests extends EntityPathBase<FriendRequests> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
 
-    public final com.gamegoo.domain.QMember fromMember;
+    public final com.gamegoo.domain.member.QMember fromMember;
 
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
     public final EnumPath<FriendRequestStatus> status = createEnum("status", FriendRequestStatus.class);
 
-    public final com.gamegoo.domain.QMember toMember;
+    public final com.gamegoo.domain.member.QMember toMember;
 
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
@@ -56,8 +56,8 @@ public QFriendRequests(PathMetadata metadata, PathInits inits) {
 
     public QFriendRequests(Class<? extends FriendRequests> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
-        this.fromMember = inits.isInitialized("fromMember") ? new com.gamegoo.domain.QMember(forProperty("fromMember")) : null;
-        this.toMember = inits.isInitialized("toMember") ? new com.gamegoo.domain.QMember(forProperty("toMember")) : null;
+        this.fromMember = inits.isInitialized("fromMember") ? new com.gamegoo.domain.member.QMember(forProperty("fromMember")) : null;
+        this.toMember = inits.isInitialized("toMember") ? new com.gamegoo.domain.member.QMember(forProperty("toMember")) : null;
     }
 
 }

src/main/generated/com/gamegoo/domain/gamestyle/QMemberGameStyle.java

@@ -31,7 +31,7 @@ public class QMemberGameStyle extends EntityPathBase<MemberGameStyle> {
 
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
-    public final com.gamegoo.domain.QMember member;
+    public final com.gamegoo.domain.member.QMember member;
 
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
@@ -55,7 +55,7 @@ public QMemberGameStyle(PathMetadata metadata, PathInits inits) {
     public QMemberGameStyle(Class<? extends MemberGameStyle> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
         this.gameStyle = inits.isInitialized("gameStyle") ? new QGameStyle(forProperty("gameStyle")) : null;
-        this.member = inits.isInitialized("member") ? new com.gamegoo.domain.QMember(forProperty("member")) : null;
+        this.member = inits.isInitialized("member") ? new com.gamegoo.domain.member.QMember(forProperty("member")) : null;
     }
 
 }

src/main/generated/com/gamegoo/domain/manner/QMannerRating.java

@@ -27,15 +27,15 @@ public class QMannerRating extends EntityPathBase<MannerRating> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdAt = _super.createdAt;
 
-    public final com.gamegoo.domain.QMember fromMember;
+    public final com.gamegoo.domain.member.QMember fromMember;
 
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
     public final BooleanPath isPositive = createBoolean("isPositive");
 
     public final ListPath<MannerRatingKeyword, QMannerRatingKeyword> mannerRatingKeywordList = this.<MannerRatingKeyword, QMannerRatingKeyword>createList("mannerRatingKeywordList", MannerRatingKeyword.class, QMannerRatingKeyword.class, PathInits.DIRECT2);
 
-    public final com.gamegoo.domain.QMember toMember;
+    public final com.gamegoo.domain.member.QMember toMember;
 
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
@@ -58,8 +58,8 @@ public QMannerRating(PathMetadata metadata, PathInits inits) {
 
     public QMannerRating(Class<? extends MannerRating> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
-        this.fromMember = inits.isInitialized("fromMember") ? new com.gamegoo.domain.QMember(forProperty("fromMember")) : null;
-        this.toMember = inits.isInitialized("toMember") ? new com.gamegoo.domain.QMember(forProperty("toMember")) : null;
+        this.fromMember = inits.isInitialized("fromMember") ? new com.gamegoo.domain.member.QMember(forProperty("fromMember")) : null;
+        this.toMember = inits.isInitialized("toMember") ? new com.gamegoo.domain.member.QMember(forProperty("toMember")) : null;
     }
 
 }

src/main/generated/com/gamegoo/domain/QMember.java → src/main/generated/com/gamegoo/domain/member/QMember.java

@@ -1,4 +1,4 @@
-package com.gamegoo.domain;
+package com.gamegoo.domain.member;
 
 import static com.querydsl.core.types.PathMetadataFactory.*;
 
@@ -16,15 +16,15 @@
 @Generated("com.querydsl.codegen.DefaultEntitySerializer")
 public class QMember extends EntityPathBase<Member> {
 
-    private static final long serialVersionUID = -573681762L;
+    private static final long serialVersionUID = 321613610L;
 
     public static final QMember member = new QMember("member1");
 
     public final com.gamegoo.domain.common.QBaseDateTimeEntity _super = new com.gamegoo.domain.common.QBaseDateTimeEntity(this);
 
     public final BooleanPath blind = createBoolean("blind");
 
-    public final ListPath<Block, QBlock> blockList = this.<Block, QBlock>createList("blockList", Block.class, QBlock.class, PathInits.DIRECT2);
+    public final ListPath<com.gamegoo.domain.Block, com.gamegoo.domain.QBlock> blockList = this.<com.gamegoo.domain.Block, com.gamegoo.domain.QBlock>createList("blockList", com.gamegoo.domain.Block.class, com.gamegoo.domain.QBlock.class, PathInits.DIRECT2);
 
     public final ListPath<com.gamegoo.domain.board.Board, com.gamegoo.domain.board.QBoard> boardList = this.<com.gamegoo.domain.board.Board, com.gamegoo.domain.board.QBoard>createList("boardList", com.gamegoo.domain.board.Board.class, com.gamegoo.domain.board.QBoard.class, PathInits.DIRECT2);
 
@@ -37,7 +37,7 @@ public class QMember extends EntityPathBase<Member> {
 
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
-    public final EnumPath<com.gamegoo.domain.enums.LoginType> loginType = createEnum("loginType", com.gamegoo.domain.enums.LoginType.class);
+    public final EnumPath<LoginType> loginType = createEnum("loginType", LoginType.class);
 
     public final NumberPath<Integer> mainPosition = createNumber("mainPosition", Integer.class);
 
@@ -69,7 +69,7 @@ public class QMember extends EntityPathBase<Member> {
 
     public final StringPath tag = createString("tag");
 
-    public final StringPath tier = createString("tier");
+    public final EnumPath<Tier> tier = createEnum("tier", Tier.class);
 
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;

src/main/generated/com/gamegoo/domain/notification/QNotification.java

@@ -33,7 +33,7 @@ public class QNotification extends EntityPathBase<Notification> {
 
     public final BooleanPath isRead = createBoolean("isRead");
 
-    public final com.gamegoo.domain.QMember member;
+    public final com.gamegoo.domain.member.QMember member;
 
     public final QNotificationType notificationType;
 
@@ -60,7 +60,7 @@ public QNotification(PathMetadata metadata, PathInits inits) {
 
     public QNotification(Class<? extends Notification> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
-        this.member = inits.isInitialized("member") ? new com.gamegoo.domain.QMember(forProperty("member")) : null;
+        this.member = inits.isInitialized("member") ? new com.gamegoo.domain.member.QMember(forProperty("member")) : null;
         this.notificationType = inits.isInitialized("notificationType") ? new QNotificationType(forProperty("notificationType")) : null;
     }
 

src/main/generated/com/gamegoo/domain/report/QReport.java

@@ -31,11 +31,11 @@ public class QReport extends EntityPathBase<Report> {
 
     public final StringPath reportContent = createString("reportContent");
 
-    public final com.gamegoo.domain.QMember reporter;
+    public final com.gamegoo.domain.member.QMember reporter;
 
     public final ListPath<ReportTypeMapping, QReportTypeMapping> reportTypeMappingList = this.<ReportTypeMapping, QReportTypeMapping>createList("reportTypeMappingList", ReportTypeMapping.class, QReportTypeMapping.class, PathInits.DIRECT2);
 
-    public final com.gamegoo.domain.QMember target;
+    public final com.gamegoo.domain.member.QMember target;
 
     //inherited
     public final DateTimePath<java.time.LocalDateTime> updatedAt = _super.updatedAt;
@@ -58,8 +58,8 @@ public QReport(PathMetadata metadata, PathInits inits) {
 
     public QReport(Class<? extends Report> type, PathMetadata metadata, PathInits inits) {
         super(type, metadata, inits);
-        this.reporter = inits.isInitialized("reporter") ? new com.gamegoo.domain.QMember(forProperty("reporter")) : null;
-        this.target = inits.isInitialized("target") ? new com.gamegoo.domain.QMember(forProperty("target")) : null;
+        this.reporter = inits.isInitialized("reporter") ? new com.gamegoo.domain.member.QMember(forProperty("reporter")) : null;
+        this.target = inits.isInitialized("target") ? new com.gamegoo.domain.member.QMember(forProperty("target")) : null;
     }
 
 }