Merge pull request #72 from team-MoPlus/develop

1차 어드민 배포

Author: sejoon00

.github/workflows/CI.yml

@@ -0,0 +1,38 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
+# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
+
+name: Gradle Package
+
+on:
+  pull_request:
+    branches:
+      - "master"
+      - "develop"
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: checkout
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+
+      - name: build and test
+        run: |
+          chmod +x gradlew
+          ./gradlew build 

.gitignore

@@ -4,8 +4,8 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
-
 .env
+local.env
 
 ### STS ###
 .apt_generated
@@ -37,3 +37,5 @@ out/
 
 ### VS Code ###
 .vscode/
+
+src/test/resources/insert-search-problem.sql

Dockerfile

@@ -2,17 +2,6 @@ FROM openjdk:17
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} app.jar
 
-ARG apm_agent=apm-agent/*.jar
-COPY ${apm_agent} apm-agent.jar
-
-ARG PROFILE=dev
 ENV SPRING_PROFILES_ACTIVE=${PROFILE}
 
-ENTRYPOINT ["java", \
-"-javaagent:/apm-agent.jar", \
-"-Delastic.apm.server_urls=http://114.70.23.79:8200", \
-"-Delastic.apm.service_name=moplus-apm-agent", \
-"-Delastic.apm.application_packages=com.server", \
-"-Delastic.apm.environment=dev", \
-"-jar", \
-"/app.jar"]
+ENTRYPOINT ["java", "-jar", "app.jar"]

Dockerfile.prod

@@ -2,17 +2,6 @@ FROM openjdk:17
 ARG JAR_FILE=build/libs/*.jar
 COPY ${JAR_FILE} app.jar
 
-ARG apm_agent=apm-agent/*.jar
-COPY ${apm_agent} apm-agent.jar
-
-ARG PROFILE=dev
 ENV SPRING_PROFILES_ACTIVE=${PROFILE}
 
-ENTRYPOINT ["java", \
-"-javaagent:/apm-agent.jar", \
-"-Delastic.apm.server_urls=http://114.70.23.79:8200", \
-"-Delastic.apm.service_name=moplus-apm-agent", \
-"-Delastic.apm.application_packages=com.server", \
-"-Delastic.apm.environment=prod", \
-"-jar", \
-"/app.jar"]
+ENTRYPOINT ["java", "-jar", "app.jar"]

README.md

@@ -1,30 +1,47 @@
+# 모플: 매일 3문항 수학 사고력 향상 서비스  
 
+매일 **기출 문제 3문항**을 풀며, **수학 사고력 취약점을 진단, 처방, 교정**까지 한 번에 해결하는 **올인원 수학 사고력 향상 서비스**입니다.
 
-![깃허브 배너](https://github.com/user-attachments/assets/e0f52d08-05f9-44ba-9a71-f20cb9d52743)
+---
 
-<br/>
+## 🎯 사용자 서비스 기능  
+<div style="display: flex; justify-content: center; gap: 10px;">
+  <img src="https://github.com/user-attachments/assets/a4c8cf3c-72f9-4d99-b701-ff5f9cc5f85d" width="250" height="400"/>
+  <img src="https://github.com/user-attachments/assets/7704d134-8b45-4320-996c-5aa7deafffbd" width="250" height="400"/>
+  <img src="https://github.com/user-attachments/assets/0eb0bcb3-a400-43ae-8eda-773b09795d03" width="250" height="400"/>
+</div>
 
-<h2>  빠르게 받아보는 내 취약점 복습서, 모플  </h2>
-<h3> 기능1: 빠르게 틀린 문제를 체크해서 내 점수와 등급을 받아보세요. </h3>
-<h3> 기능2: 입력한 오답문제를 바탕으로 복습서를 제공합니다. </h3>
-<h3> 기능3: 친구에게 내 결과를 공유해보세요. </h3>
+- **핵심 사고 과정 점검**: 각 기출 문항은 3개의 세부 문항으로 구성되어 있어, 취약점을 명확히 진단할 수 있습니다.  
+- **손해설 및 풀이 과정 제공**: 풀이 후, 문제 해결 과정에서 필요했던 핵심 사고력을 정리하여 개념 보완을 돕습니다.  
+- **오답 분석 및 맞춤 처방**: 세부 문항별 오답을 분석하고, 추가 학습이 필요한 개념을 처방합니다.  
+- **교정 학습 기능**: 틀린 문제와 유사한 문제를 다시 풀며, 취약한 사고 과정을 보완하고 사고력을 강화할 수 있습니다.  
 
-<br/>
+---
 
-<h2>  Admin 페이지  </h2>
-<h3> Thymeleaf를 통해 구현한 어드민 페이지로 모의고사에 대한 정보, 정답, 정답률, 문제 이미지를 업로드할 수 있습니다. </h3>
-<div style="display: grid; grid-template-columns: 1fr 1fr; gap: 10px;">
-  <img src="https://github.com/user-attachments/assets/f9bfffc3-7708-49a4-b240-80ea71bae83e" alt="image" width="400" height="400">
-  <img src="https://github.com/user-attachments/assets/6bf10fa0-018a-4e63-9219-442ed3843312" alt="image" width="400" height="400">
-  <img src="https://github.com/user-attachments/assets/b255e176-8eec-4666-b190-12c6e5a3c996" alt="image" width="400" height="400">
-  <img src="https://github.com/user-attachments/assets/26ac807a-eeab-42ab-8f66-bcb9af101ee4" alt="image" width="400" height="400">
+## 🛠 어드민 서비스 기능  
+<div style="display: flex; flex-direction: column; align-items: center; gap: 10px;">
+  <img width="900" src="https://github.com/user-attachments/assets/c5007734-4f8c-4fb4-80fe-c46a98293798" />
+  <img width="900" src="https://github.com/user-attachments/assets/eb8342d1-1ec9-46bb-a6b0-664f87eaca8e" />
+  <img width="900" src="https://github.com/user-attachments/assets/90d4003d-4836-4408-9dd5-d698b57c2cab" />
 </div>
 
+- **문항 및 세부 문항 등록**: 새 문제와 세부 문항을 손쉽게 등록할 수 있습니다.  
+- **세트 구성 및 일정 관리**: 여러 문항을 세트로 묶어 원하는 날짜에 발행 가능합니다.  
+- **자동 배포 기능**: 발행된 세트는 사용자에게 **"오늘의 문제"**로 제공됩니다.  
 
-<br/>
+---
 
-## 서버 팀원 소개
-|[BE 개발자 박세준](https://github.com/sejoon00)|
-|:--------:|
-|<img src="https://avatars.githubusercontent.com/u/74056843?v=4" width=200>|
+## 🏗 Architecture  
+<div style="display: flex; justify-content: center;">
+  <img width="900" src="https://github.com/user-attachments/assets/dae74b75-2c3f-436a-ac43-f09bcb1233ec" />
+</div>
 
+- 서비스의 **안정적인 운영을 위해 prod(운영)과 dev(개발) 서버를 분리**하여 배포 및 관리하고 있습니다.  
+
+---
+
+## 서버 팀원 소개
+|<img src="https://avatars.githubusercontent.com/u/74056843?v=4" width=200>|<img src="https://avatars.githubusercontent.com/u/101867059?v=4" width=200>|
+|:--------:|:--------:|
+|[BE 박세준](https://github.com/sejoon00)|[BE 홍석범](https://github.com/seokbeom00)|
+</br>

build.gradle

@@ -23,6 +23,7 @@ repositories {
     mavenCentral()
 }
 
+
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
@@ -33,6 +34,10 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
+    // Spring Security
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+    testImplementation 'org.springframework.security:spring-security-test'
+
     //db-h2
     implementation 'com.h2database:h2'
     testImplementation 'com.h2database:h2'
@@ -44,6 +49,28 @@ dependencies {
     //s3
     implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 
+    // JWT
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
+    // validator
+    implementation 'commons-validator:commons-validator:1.7'
+
+    // Map Struct
+    implementation 'org.mapstruct:mapstruct:1.6.3'
+    annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.3'
+    annotationProcessor 'org.projectlombok:lombok-mapstruct-binding:0.2.0'
+
+    // JPA
+    implementation 'jakarta.persistence:jakarta.persistence-api:3.1.0'
+    implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
+
+    // QueryDSL
+    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"
 }
 
 tasks.named('test') {

docker-compose-dev.yml

@@ -22,6 +22,11 @@ services:
       - CLOUD_AWS_REGION_STATIC=${AWS_REGION}
       - CLOUD_AWS_REGION_AUTO=false
       - CLOUD_AWS_STACK_AUTO=false
+      - JWT_ACCESS_TOKEN_SECRET=${JWT_ACCESS_TOKEN_SECRET}
+      - JWT_REFRESH_TOKEN_SECRET=${JWT_REFRESH_TOKEN_SECRET}
+      - 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}
 
     depends_on:
       - mysql

src/main/generated/com/moplus/moplus_server/domain/concept/domain/QConceptTag.java

@@ -0,0 +1,47 @@
+package com.moplus.moplus_server.domain.concept.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;
+
+
+/**
+ * QConceptTag is a Querydsl query type for ConceptTag
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QConceptTag extends EntityPathBase<ConceptTag> {
+
+    private static final long serialVersionUID = 652954745L;
+
+    public static final QConceptTag conceptTag = new QConceptTag("conceptTag");
+
+    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 StringPath name = createString("name");
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
+
+    public QConceptTag(String variable) {
+        super(ConceptTag.class, forVariable(variable));
+    }
+
+    public QConceptTag(Path<? extends ConceptTag> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QConceptTag(PathMetadata metadata) {
+        super(ConceptTag.class, metadata);
+    }
+
+}
+

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

@@ -0,0 +1,53 @@
+package com.moplus.moplus_server.domain.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;
+
+
+/**
+ * QMember is a Querydsl query type for Member
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QMember extends EntityPathBase<Member> {
+
+    private static final long serialVersionUID = -705761779L;
+
+    public static final QMember member = new QMember("member1");
+
+    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 StringPath email = createString("email");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    public final StringPath name = createString("name");
+
+    public final StringPath password = createString("password");
+
+    public final EnumPath<MemberRole> role = createEnum("role", MemberRole.class);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> updatedDate = _super.updatedDate;
+
+    public QMember(String variable) {
+        super(Member.class, forVariable(variable));
+    }
+
+    public QMember(Path<? extends Member> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QMember(PathMetadata metadata) {
+        super(Member.class, metadata);
+    }
+
+}
+

src/main/generated/com/moplus/moplus_server/domain/problem/domain/QAnswer.java

@@ -0,0 +1,37 @@
+package com.moplus.moplus_server.domain.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;
+
+
+/**
+ * QAnswer is a Querydsl query type for Answer
+ */
+@Generated("com.querydsl.codegen.DefaultEmbeddableSerializer")
+public class QAnswer extends BeanPath<Answer> {
+
+    private static final long serialVersionUID = 983834524L;
+
+    public static final QAnswer answer = new QAnswer("answer");
+
+    public final StringPath value = createString("value");
+
+    public QAnswer(String variable) {
+        super(Answer.class, forVariable(variable));
+    }
+
+    public QAnswer(Path<? extends Answer> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QAnswer(PathMetadata metadata) {
+        super(Answer.class, metadata);
+    }
+
+}
+