개발 서버의 내용을 운영 서버로 배포

docker-compose-dev.yml

@@ -27,6 +27,9 @@ services:
       - JWT_ACCESS_TOKEN_EXPIRATION_TIME=${JWT_ACCESS_TOKEN_EXPIRATION_TIME} # 기본값: 2시간
       - JWT_REFRESH_TOKEN_EXPIRATION_TIME=${JWT_REFRESH_TOKEN_EXPIRATION_TIME} # 기본값: 7일
       - JWT_ISSUER=${JWT_ISSUER}
+      - KAKAO_LOGIN_CLIENT_ID=${KAKAO_LOGIN_CLIENT_ID}
+      - KAKAO_LOGIN_CLIENT_SECRET=${KAKAO_LOGIN_CLIENT_SECRET}
+      - KAKAO_LOGIN_REDIRECT_URI=${KAKAO_LOGIN_DEV_REDIRECT_URI}
 
     depends_on:
       - mysql

docker-compose-prod.yml

@@ -27,6 +27,9 @@ services:
       - JWT_ACCESS_TOKEN_EXPIRATION_TIME=${JWT_ACCESS_TOKEN_EXPIRATION_TIME} # 기본값: 2시간
       - JWT_REFRESH_TOKEN_EXPIRATION_TIME=${JWT_REFRESH_TOKEN_EXPIRATION_TIME} # 기본값: 7일
       - JWT_ISSUER=${JWT_ISSUER}
+      - KAKAO_LOGIN_CLIENT_ID=${KAKAO_LOGIN_CLIENT_ID}
+      - KAKAO_LOGIN_CLIENT_SECRET=${KAKAO_LOGIN_CLIENT_SECRET}
+      - KAKAO_LOGIN_REDIRECT_URI=${KAKAO_LOGIN_PROD_REDIRECT_URI}
     depends_on:
       - mysql
     networks:

src/main/generated/com/moplus/moplus_server/domain/publish/domain/QPublish.java → src/main/generated/com/moplus/moplus_server/admin/publish/domain/QPublish.java

@@ -1,4 +1,4 @@
-package com.moplus.moplus_server.domain.publish.domain;
+package com.moplus.moplus_server.admin.publish.domain;
 
 import static com.querydsl.core.types.PathMetadataFactory.*;
 
@@ -15,7 +15,7 @@
 @Generated("com.querydsl.codegen.DefaultEntitySerializer")
 public class QPublish extends EntityPathBase<Publish> {
 
-    private static final long serialVersionUID = 1565569153L;
+    private static final long serialVersionUID = 1641302032L;
 
     public static final QPublish publish = new QPublish("publish");
 

src/main/generated/com/moplus/moplus_server/client/submit/domain/QChildProblemSubmit.java

@@ -0,0 +1,53 @@
+package com.moplus.moplus_server.client.submit.domain;
+
+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;
+
+
+/**
+ * QChildProblemSubmit is a Querydsl query type for ChildProblemSubmit
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QChildProblemSubmit extends EntityPathBase<ChildProblemSubmit> {
+
+    private static final long serialVersionUID = -1656142683L;
+
+    public static final QChildProblemSubmit childProblemSubmit = new QChildProblemSubmit("childProblemSubmit");
+
+    public final com.moplus.moplus_server.global.common.QBaseEntity _super = new com.moplus.moplus_server.global.common.QBaseEntity(this);
+
+    public final NumberPath<Long> childProblemId = createNumber("childProblemId", Long.class);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final NumberPath<Long> memberId = createNumber("memberId", Long.class);
+
+    public final NumberPath<Long> publishId = createNumber("publishId", Long.class);
+
+    public final EnumPath<ChildProblemSubmitStatus> status = createEnum("status", ChildProblemSubmitStatus.class);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
+
+    public QChildProblemSubmit(String variable) {
+        super(ChildProblemSubmit.class, forVariable(variable));
+    }
+
+    public QChildProblemSubmit(Path<? extends ChildProblemSubmit> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QChildProblemSubmit(PathMetadata metadata) {
+        super(ChildProblemSubmit.class, metadata);
+    }
+
+}
+

src/main/generated/com/moplus/moplus_server/client/submit/domain/QProblemSubmit.java

@@ -0,0 +1,53 @@
+package com.moplus.moplus_server.client.submit.domain;
+
+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;
+
+
+/**
+ * QProblemSubmit is a Querydsl query type for ProblemSubmit
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QProblemSubmit extends EntityPathBase<ProblemSubmit> {
+
+    private static final long serialVersionUID = 1682818189L;
+
+    public static final QProblemSubmit problemSubmit = new QProblemSubmit("problemSubmit");
+
+    public final com.moplus.moplus_server.global.common.QBaseEntity _super = new com.moplus.moplus_server.global.common.QBaseEntity(this);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdDate = _super.createdDate;
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final NumberPath<Long> memberId = createNumber("memberId", Long.class);
+
+    public final NumberPath<Long> problemId = createNumber("problemId", Long.class);
+
+    public final NumberPath<Long> publishId = createNumber("publishId", Long.class);
+
+    public final EnumPath<ProblemSubmitStatus> status = createEnum("status", ProblemSubmitStatus.class);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
+
+    public QProblemSubmit(String variable) {
+        super(ProblemSubmit.class, forVariable(variable));
+    }
+
+    public QProblemSubmit(Path<? extends ProblemSubmit> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QProblemSubmit(PathMetadata metadata) {
+        super(ProblemSubmit.class, metadata);
+    }
+
+}
+

src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ChildProblemMapperImpl.java

@@ -1,7 +1,7 @@
 package com.moplus.moplus_server.domain.problem.service.mapper;
 
+import com.moplus.moplus_server.admin.problem.dto.request.ChildProblemUpdateRequest;
 import com.moplus.moplus_server.domain.problem.domain.childProblem.ChildProblem;
-import com.moplus.moplus_server.domain.problem.dto.request.ChildProblemUpdateRequest;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -11,7 +11,7 @@
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-03-03T17:28:35+0900",
+    date = "2025-03-24T01:02:22+0900",
     comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.10 (JetBrains s.r.o.)"
 )
 @Component

src/main/generated/com/moplus/moplus_server/domain/problem/service/mapper/ProblemMapperImpl.java

@@ -1,11 +1,11 @@
 package com.moplus.moplus_server.domain.problem.service.mapper;
 
+import com.moplus.moplus_server.admin.problem.dto.request.ProblemPostRequest;
+import com.moplus.moplus_server.admin.problem.dto.request.ProblemUpdateRequest;
 import com.moplus.moplus_server.domain.problem.domain.practiceTest.PracticeTestTag;
 import com.moplus.moplus_server.domain.problem.domain.problem.Problem;
 import com.moplus.moplus_server.domain.problem.domain.problem.ProblemCustomId;
 import com.moplus.moplus_server.domain.problem.domain.problem.ProblemType;
-import com.moplus.moplus_server.domain.problem.dto.request.ProblemPostRequest;
-import com.moplus.moplus_server.domain.problem.dto.request.ProblemUpdateRequest;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -15,7 +15,7 @@
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-03-03T17:28:35+0900",
+    date = "2025-03-24T01:02:22+0900",
     comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.10 (JetBrains s.r.o.)"
 )
 @Component

src/main/generated/com/moplus/moplus_server/domain/v0/TestResult/entity/QIncorrectProblem.java

@@ -37,7 +37,7 @@ public class QIncorrectProblem extends EntityPathBase<IncorrectProblem> {
 
     public final NumberPath<Long> practiceTestId = createNumber("practiceTestId", Long.class);
 
-    public final NumberPath<Long> problemId = createNumber("problemCustomId", Long.class);
+    public final NumberPath<Long> problemId = createNumber("problemId", Long.class);
 
     public final StringPath problemNumber = createString("problemNumber");
 

src/main/generated/com/moplus/moplus_server/domain/v0/practiceTest/domain/QProblemImageForTest.java

@@ -25,7 +25,7 @@ public class QProblemImageForTest extends EntityPathBase<ProblemImageForTest> {
 
     public final StringPath imageUrl = createString("imageUrl");
 
-    public final NumberPath<Long> problemId = createNumber("problemCustomId", Long.class);
+    public final NumberPath<Long> problemId = createNumber("problemId", Long.class);
 
     public QProblemImageForTest(String variable) {
         super(ProblemImageForTest.class, forVariable(variable));

src/main/generated/com/moplus/moplus_server/domain/member/domain/QMember.java → src/main/generated/com/moplus/moplus_server/member/domain/QMember.java

@@ -1,4 +1,4 @@
-package com.moplus.moplus_server.domain.member.domain;
+package com.moplus.moplus_server.member.domain;
 
 import static com.querydsl.core.types.PathMetadataFactory.*;
 
@@ -7,6 +7,7 @@
 import com.querydsl.core.types.PathMetadata;
 import javax.annotation.processing.Generated;
 import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.PathInits;
 
 
 /**
@@ -15,7 +16,9 @@
 @Generated("com.querydsl.codegen.DefaultEntitySerializer")
 public class QMember extends EntityPathBase<Member> {
 
-    private static final long serialVersionUID = -705761779L;
+    private static final long serialVersionUID = -1541748259L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
 
     public static final QMember member = new QMember("member1");
 
@@ -30,6 +33,8 @@ public class QMember extends EntityPathBase<Member> {
 
     public final StringPath name = createString("name");
 
+    public final QOauthInfo oauthInfo;
+
     public final StringPath password = createString("password");
 
     public final EnumPath<MemberRole> role = createEnum("role", MemberRole.class);
@@ -38,15 +43,24 @@ public class QMember extends EntityPathBase<Member> {
     public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
 
     public QMember(String variable) {
-        super(Member.class, forVariable(variable));
+        this(Member.class, forVariable(variable), INITS);
     }
 
     public QMember(Path<? extends Member> path) {
-        super(path.getType(), path.getMetadata());
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
     }
 
     public QMember(PathMetadata metadata) {
-        super(Member.class, metadata);
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QMember(PathMetadata metadata, PathInits inits) {
+        this(Member.class, metadata, inits);
+    }
+
+    public QMember(Class<? extends Member> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.oauthInfo = inits.isInitialized("oauthInfo") ? new QOauthInfo(forProperty("oauthInfo")) : null;
     }
 
 }

src/main/generated/com/moplus/moplus_server/member/domain/QOauthInfo.java

@@ -0,0 +1,43 @@
+package com.moplus.moplus_server.member.domain;
+
+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;
+
+
+/**
+ * QOauthInfo is a Querydsl query type for OauthInfo
+ */
+@Generated("com.querydsl.codegen.DefaultEmbeddableSerializer")
+public class QOauthInfo extends BeanPath<OauthInfo> {
+
+    private static final long serialVersionUID = 1483708866L;
+
+    public static final QOauthInfo oauthInfo = new QOauthInfo("oauthInfo");
+
+    public final StringPath name = createString("name");
+
+    public final StringPath oauthEmail = createString("oauthEmail");
+
+    public final StringPath oauthId = createString("oauthId");
+
+    public final StringPath oauthProvider = createString("oauthProvider");
+
+    public QOauthInfo(String variable) {
+        super(OauthInfo.class, forVariable(variable));
+    }
+
+    public QOauthInfo(Path<? extends OauthInfo> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QOauthInfo(PathMetadata metadata) {
+        super(OauthInfo.class, metadata);
+    }
+
+}
+

src/main/generated/com/moplus/moplus_server/statistic/Problem/domain/QChildProblemStatistic.java

@@ -0,0 +1,53 @@
+package com.moplus.moplus_server.statistic.Problem.domain;
+
+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;
+
+
+/**
+ * QChildProblemStatistic is a Querydsl query type for ChildProblemStatistic
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QChildProblemStatistic extends EntityPathBase<ChildProblemStatistic> {
+
+    private static final long serialVersionUID = 1136828573L;
+
+    private static final PathInits INITS = PathInits.DIRECT2;
+
+    public static final QChildProblemStatistic childProblemStatistic = new QChildProblemStatistic("childProblemStatistic");
+
+    public final NumberPath<Long> childProblemId = createNumber("childProblemId", Long.class);
+
+    public final QCountStatistic countStatistic;
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public QChildProblemStatistic(String variable) {
+        this(ChildProblemStatistic.class, forVariable(variable), INITS);
+    }
+
+    public QChildProblemStatistic(Path<? extends ChildProblemStatistic> path) {
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
+    }
+
+    public QChildProblemStatistic(PathMetadata metadata) {
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QChildProblemStatistic(PathMetadata metadata, PathInits inits) {
+        this(ChildProblemStatistic.class, metadata, inits);
+    }
+
+    public QChildProblemStatistic(Class<? extends ChildProblemStatistic> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.countStatistic = inits.isInitialized("countStatistic") ? new QCountStatistic(forProperty("countStatistic")) : null;
+    }
+
+}
+