Skip to content

Commit 9662220

Browse files
committed
Merge remote-tracking branch 'origin/develop' into refactor/#83
2 parents 7cca368 + 4f2ab0c commit 9662220

File tree

84 files changed

+341
-161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+341
-161
lines changed

.github/workflows/CD-dev.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ jobs:
3232
fi
3333
3434
./gradlew clean build
35-
docker rm -f moplus-server-dev --force
36-
docker rmi moplus-server-dev
37-
docker-compose -f docker-compose-dev.yml -p moplus-dev up --build -d
35+
docker rm -f pointer-server-dev --force
36+
docker rmi pointer-server-dev
37+
docker-compose -f docker-compose-dev.yml -p pointer-dev up --build -d

.github/workflows/CD-prod.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
fi
3232
3333
./gradlew clean build
34-
docker rm -f moplus-server-prod --force
35-
docker rmi moplus-server-prod
36-
docker-compose -f docker-compose-prod.yml -p moplus-prod up --build -d
34+
docker rm -f pointer-server-prod --force
35+
docker rmi pointer-server-prod
36+
docker-compose -f docker-compose-prod.yml -p pointer-prod up --build -d
3737

docker-compose-dev.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ services:
33
build:
44
context: .
55
dockerfile: Dockerfile
6-
container_name: moplus-server-dev
7-
image: moplus-server-dev
6+
container_name: pointer-server-dev
7+
image: pointer-server-dev
88
restart: always
99
ports:
1010
- 8081:8080
1111
environment:
1212
- TZ=Asia/Seoul
1313
- SPRING_PROFILES_ACTIVE=dev
14-
- SPRING_DATASOURCE_URL=jdbc:mysql://moplus-mysql-dev:3306/${DEV_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
14+
- SPRING_DATASOURCE_URL=jdbc:mysql://pointer-mysql-dev:3306/${DEV_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
1515
- SPRING_DATASOURCE_USERNAME=${DEV_MYSQL_USER}
1616
- SPRING_DATASOURCE_PASSWORD=${DEV_MYSQL_PASSWORD}
1717
- SENTRY_DSN=${SENTRY_DSN}
@@ -31,12 +31,12 @@ services:
3131
depends_on:
3232
- mysql
3333
networks:
34-
- moplus-dev
34+
- pointer-dev
3535
- nginx-network
3636

3737
mysql:
3838
image: mysql:8.0
39-
container_name: moplus-mysql-dev
39+
container_name: pointer-mysql-dev
4040
environment:
4141
MYSQL_ROOT_PASSWORD: ${DEV_MYSQL_ROOT_PASSWORD}
4242
MYSQL_DATABASE: ${DEV_MYSQL_DATABASE}
@@ -47,7 +47,7 @@ services:
4747
volumes:
4848
- dev_data:/var/lib/mysql
4949
networks:
50-
- moplus-dev
50+
- pointer-dev
5151
volumes:
5252
dev_data:
5353
driver: local
@@ -57,7 +57,7 @@ volumes:
5757
device: ../mopl_data/dev_data
5858

5959
networks:
60-
moplus-dev:
60+
pointer-dev:
6161
driver: bridge
6262
nginx-network:
6363
external: true

docker-compose-prod.yml

+14-9
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ services:
33
build:
44
context: .
55
dockerfile: Dockerfile.prod
6-
container_name: moplus-server-prod
7-
image: moplus-server-prod
6+
container_name: pointer-server-prod
7+
image: pointer-server-prod
88
restart: always
99
ports:
1010
- 8080:8080
1111
environment:
1212
- TZ=Asia/Seoul
1313
- SPRING_PROFILES_ACTIVE=prod
14-
- SPRING_DATASOURCE_URL=jdbc:mysql://moplus-mysql-prod:3306/${PROD_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
14+
- SPRING_DATASOURCE_URL=jdbc:mysql://pointer-mysql-prod:3306/${PROD_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
1515
- SPRING_DATASOURCE_USERNAME=${PROD_MYSQL_USER}
1616
- SPRING_DATASOURCE_PASSWORD=${PROD_MYSQL_PASSWORD}
1717
- SENTRY_DSN=${SENTRY_DSN}
@@ -30,12 +30,12 @@ services:
3030
depends_on:
3131
- mysql
3232
networks:
33-
- moplus-prod
33+
- pointer-prod
3434
- nginx-network
3535

3636
mysql:
3737
image: mysql:8.0
38-
container_name: moplus-mysql-prod
38+
container_name: pointer-mysql-prod
3939
environment:
4040
MYSQL_ROOT_PASSWORD: ${PROD_MYSQL_ROOT_PASSWORD}
4141
MYSQL_DATABASE: ${PROD_MYSQL_DATABASE}
@@ -44,14 +44,19 @@ services:
4444
ports:
4545
- "3306:3306"
4646
volumes:
47-
- moplus_prod_data:/var/lib/mysql
47+
- pointer_prod_data:/var/lib/mysql
4848
networks:
49-
- moplus-prod
49+
- pointer-prod
5050
volumes:
51-
moplus_prod_data:
51+
pointer_prod_data:
52+
driver: local
53+
driver_opts:
54+
type: none
55+
o: bind
56+
device: ../mopl_data/pointer_prod_data
5257

5358
networks:
54-
moplus-prod:
59+
pointer-prod:
5560
driver: bridge
5661
nginx-network:
5762
external: true

src/main/java/com/moplus/moplus_server/domain/concept/controller/ConceptTagController.java src/main/java/com/moplus/moplus_server/admin/concept/controller/ConceptTagController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.moplus.moplus_server.domain.concept.controller;
1+
package com.moplus.moplus_server.admin.concept.controller;
22

3-
import com.moplus.moplus_server.domain.concept.dto.response.ConceptTagResponse;
3+
import com.moplus.moplus_server.admin.concept.dto.response.ConceptTagResponse;
44
import com.moplus.moplus_server.domain.concept.repository.ConceptTagRepository;
55
import io.swagger.v3.oas.annotations.Operation;
66
import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/moplus/moplus_server/domain/concept/dto/response/ConceptTagResponse.java src/main/java/com/moplus/moplus_server/admin/concept/dto/response/ConceptTagResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.concept.dto.response;
1+
package com.moplus.moplus_server.admin.concept.dto.response;
22

33
import com.moplus.moplus_server.domain.concept.domain.ConceptTag;
44
import jakarta.validation.constraints.NotNull;

src/main/java/com/moplus/moplus_server/domain/problem/controller/ImageUploadController.java src/main/java/com/moplus/moplus_server/admin/problem/controller/ImageUploadController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.moplus.moplus_server.domain.problem.controller;
1+
package com.moplus.moplus_server.admin.problem.controller;
22

33
import com.moplus.moplus_server.domain.problem.domain.problem.ProblemImageType;
4-
import com.moplus.moplus_server.domain.problem.dto.response.PresignedUrlResponse;
4+
import com.moplus.moplus_server.admin.problem.dto.response.PresignedUrlResponse;
55
import com.moplus.moplus_server.domain.problem.service.ImageUploadService;
66
import io.swagger.v3.oas.annotations.Operation;
77
import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/moplus/moplus_server/domain/problem/controller/PracticeTestTagController.java src/main/java/com/moplus/moplus_server/admin/problem/controller/PracticeTestTagController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.moplus.moplus_server.domain.problem.controller;
1+
package com.moplus.moplus_server.admin.problem.controller;
22

3-
import com.moplus.moplus_server.domain.problem.dto.response.PracticeTestTagResponse;
3+
import com.moplus.moplus_server.admin.problem.dto.response.PracticeTestTagResponse;
44
import com.moplus.moplus_server.domain.problem.repository.PracticeTestTagRepository;
55
import io.swagger.v3.oas.annotations.Operation;
66
import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/moplus/moplus_server/domain/problem/controller/ProblemController.java src/main/java/com/moplus/moplus_server/admin/problem/controller/ProblemController.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.moplus.moplus_server.domain.problem.controller;
1+
package com.moplus.moplus_server.admin.problem.controller;
22

3-
import com.moplus.moplus_server.domain.problem.dto.request.ProblemPostRequest;
4-
import com.moplus.moplus_server.domain.problem.dto.request.ProblemUpdateRequest;
5-
import com.moplus.moplus_server.domain.problem.dto.response.ProblemGetResponse;
6-
import com.moplus.moplus_server.domain.problem.dto.response.ProblemPostResponse;
3+
import com.moplus.moplus_server.admin.problem.dto.request.ProblemPostRequest;
4+
import com.moplus.moplus_server.admin.problem.dto.request.ProblemUpdateRequest;
5+
import com.moplus.moplus_server.admin.problem.dto.response.ProblemGetResponse;
6+
import com.moplus.moplus_server.admin.problem.dto.response.ProblemPostResponse;
77
import com.moplus.moplus_server.domain.problem.service.ChildProblemService;
88
import com.moplus.moplus_server.domain.problem.service.ProblemDeleteService;
99
import com.moplus.moplus_server.domain.problem.service.ProblemGetService;

src/main/java/com/moplus/moplus_server/domain/problem/controller/ProblemSearchController.java src/main/java/com/moplus/moplus_server/admin/problem/controller/ProblemSearchController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.moplus.moplus_server.domain.problem.controller;
1+
package com.moplus.moplus_server.admin.problem.controller;
22

3-
import com.moplus.moplus_server.domain.problem.dto.response.ProblemSearchGetResponse;
3+
import com.moplus.moplus_server.admin.problem.dto.response.ProblemSearchGetResponse;
44
import com.moplus.moplus_server.domain.problem.repository.ProblemSearchRepositoryCustom;
55
import io.swagger.v3.oas.annotations.Operation;
66
import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemDeleteRequest.java src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ChildProblemDeleteRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.request;
1+
package com.moplus.moplus_server.admin.problem.dto.request;
22

33
public record ChildProblemDeleteRequest(
44
Long childProblemId

src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemPostRequest.java src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ChildProblemPostRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.request;
1+
package com.moplus.moplus_server.admin.problem.dto.request;
22

33
import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType;
44
import jakarta.validation.constraints.NotNull;

src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ChildProblemUpdateRequest.java src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ChildProblemUpdateRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.request;
1+
package com.moplus.moplus_server.admin.problem.dto.request;
22

33
import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType;
44
import jakarta.validation.constraints.NotNull;

src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ProblemPostRequest.java src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ProblemPostRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.request;
1+
package com.moplus.moplus_server.admin.problem.dto.request;
22

33
import com.moplus.moplus_server.domain.problem.domain.practiceTest.PracticeTestTag;
44
import com.moplus.moplus_server.domain.problem.domain.problem.Problem;

src/main/java/com/moplus/moplus_server/domain/problem/dto/request/ProblemUpdateRequest.java src/main/java/com/moplus/moplus_server/admin/problem/dto/request/ProblemUpdateRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.request;
1+
package com.moplus.moplus_server.admin.problem.dto.request;
22

33
import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType;
44
import com.moplus.moplus_server.domain.problem.domain.problem.ProblemType;

src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ChildProblemGetResponse.java src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ChildProblemGetResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.response;
1+
package com.moplus.moplus_server.admin.problem.dto.response;
22

33
import com.moplus.moplus_server.domain.problem.domain.childProblem.ChildProblem;
44
import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType;

src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ConceptTagSearchResponse.java src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ConceptTagSearchResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.response;
1+
package com.moplus.moplus_server.admin.problem.dto.response;
22

33
import jakarta.validation.constraints.NotNull;
44
import lombok.Getter;

src/main/java/com/moplus/moplus_server/domain/problem/dto/response/PracticeTestTagResponse.java src/main/java/com/moplus/moplus_server/admin/problem/dto/response/PracticeTestTagResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.response;
1+
package com.moplus.moplus_server.admin.problem.dto.response;
22

33
import com.moplus.moplus_server.domain.problem.domain.practiceTest.PracticeTestTag;
44
import jakarta.validation.constraints.NotNull;

src/main/java/com/moplus/moplus_server/domain/problem/dto/response/PresignedUrlResponse.java src/main/java/com/moplus/moplus_server/admin/problem/dto/response/PresignedUrlResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.response;
1+
package com.moplus.moplus_server.admin.problem.dto.response;
22

33
import jakarta.validation.constraints.NotNull;
44

src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemGetResponse.java src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ProblemGetResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.response;
1+
package com.moplus.moplus_server.admin.problem.dto.response;
22

33
import com.moplus.moplus_server.domain.problem.domain.problem.AnswerType;
44
import com.moplus.moplus_server.domain.problem.domain.problem.Problem;

src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemPostResponse.java src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ProblemPostResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.response;
1+
package com.moplus.moplus_server.admin.problem.dto.response;
22

33
import com.moplus.moplus_server.domain.problem.domain.problem.Problem;
44
import jakarta.validation.constraints.NotNull;

src/main/java/com/moplus/moplus_server/domain/problem/dto/response/ProblemSearchGetResponse.java src/main/java/com/moplus/moplus_server/admin/problem/dto/response/ProblemSearchGetResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problem.dto.response;
1+
package com.moplus.moplus_server.admin.problem.dto.response;
22

33
import jakarta.validation.constraints.NotNull;
44
import java.util.Set;

src/main/java/com/moplus/moplus_server/domain/problemset/controller/ProblemSetController.java src/main/java/com/moplus/moplus_server/admin/problemset/controller/ProblemSetController.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package com.moplus.moplus_server.domain.problemset.controller;
1+
package com.moplus.moplus_server.admin.problemset.controller;
22

33
import com.moplus.moplus_server.domain.problemset.domain.ProblemSetConfirmStatus;
4-
import com.moplus.moplus_server.domain.problemset.dto.request.ProblemReorderRequest;
5-
import com.moplus.moplus_server.domain.problemset.dto.request.ProblemSetUpdateRequest;
6-
import com.moplus.moplus_server.domain.problemset.dto.response.ProblemSetGetResponse;
4+
import com.moplus.moplus_server.admin.problemset.dto.request.ProblemReorderRequest;
5+
import com.moplus.moplus_server.admin.problemset.dto.request.ProblemSetUpdateRequest;
6+
import com.moplus.moplus_server.admin.problemset.dto.response.ProblemSetGetResponse;
77
import com.moplus.moplus_server.domain.problemset.service.ProblemSetDeleteService;
88
import com.moplus.moplus_server.domain.problemset.service.ProblemSetGetService;
99
import com.moplus.moplus_server.domain.problemset.service.ProblemSetSaveService;

src/main/java/com/moplus/moplus_server/domain/problemset/controller/ProblemSetSearchController.java src/main/java/com/moplus/moplus_server/admin/problemset/controller/ProblemSetSearchController.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.moplus.moplus_server.domain.problemset.controller;
1+
package com.moplus.moplus_server.admin.problemset.controller;
22

33

4-
import com.moplus.moplus_server.domain.problemset.dto.response.ProblemSetSearchGetResponse;
4+
import com.moplus.moplus_server.admin.problemset.dto.response.ProblemSetSearchGetResponse;
55
import com.moplus.moplus_server.domain.problemset.repository.ProblemSetSearchRepositoryCustom;
66
import io.swagger.v3.oas.annotations.Operation;
77
import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemReorderRequest.java src/main/java/com/moplus/moplus_server/admin/problemset/dto/request/ProblemReorderRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problemset.dto.request;
1+
package com.moplus.moplus_server.admin.problemset.dto.request;
22

33
import jakarta.validation.constraints.NotNull;
44
import java.util.List;

src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetPostRequest.java src/main/java/com/moplus/moplus_server/admin/problemset/dto/request/ProblemSetPostRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problemset.dto.request;
1+
package com.moplus.moplus_server.admin.problemset.dto.request;
22

33
import com.moplus.moplus_server.domain.problemset.domain.ProblemSet;
44
import jakarta.validation.constraints.NotNull;

src/main/java/com/moplus/moplus_server/domain/problemset/dto/request/ProblemSetUpdateRequest.java src/main/java/com/moplus/moplus_server/admin/problemset/dto/request/ProblemSetUpdateRequest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problemset.dto.request;
1+
package com.moplus.moplus_server.admin.problemset.dto.request;
22

33
import jakarta.validation.constraints.NotNull;
44
import java.util.List;

src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetGetResponse.java src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemSetGetResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problemset.dto.response;
1+
package com.moplus.moplus_server.admin.problemset.dto.response;
22

33
import com.moplus.moplus_server.domain.problemset.domain.ProblemSet;
44
import com.moplus.moplus_server.domain.problemset.domain.ProblemSetConfirmStatus;

src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSetSearchGetResponse.java src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemSetSearchGetResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problemset.dto.response;
1+
package com.moplus.moplus_server.admin.problemset.dto.response;
22

33
import com.moplus.moplus_server.domain.problemset.domain.ProblemSetConfirmStatus;
44
import jakarta.validation.constraints.NotNull;

src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemSummaryResponse.java src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemSummaryResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problemset.dto.response;
1+
package com.moplus.moplus_server.admin.problemset.dto.response;
22

33
import com.moplus.moplus_server.domain.problem.domain.problem.Problem;
44
import jakarta.validation.constraints.NotNull;

src/main/java/com/moplus/moplus_server/domain/problemset/dto/response/ProblemThumbnailResponse.java src/main/java/com/moplus/moplus_server/admin/problemset/dto/response/ProblemThumbnailResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.problemset.dto.response;
1+
package com.moplus.moplus_server.admin.problemset.dto.response;
22

33
import lombok.Getter;
44
import lombok.NoArgsConstructor;

src/main/java/com/moplus/moplus_server/domain/publish/controller/PublishController.java src/main/java/com/moplus/moplus_server/admin/publish/controller/PublishController.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.moplus.moplus_server.domain.publish.controller;
1+
package com.moplus.moplus_server.admin.publish.controller;
22

3-
import com.moplus.moplus_server.domain.publish.dto.request.PublishPostRequest;
4-
import com.moplus.moplus_server.domain.publish.dto.response.PublishMonthGetResponse;
5-
import com.moplus.moplus_server.domain.publish.service.PublishDeleteService;
6-
import com.moplus.moplus_server.domain.publish.service.PublishGetService;
7-
import com.moplus.moplus_server.domain.publish.service.PublishSaveService;
3+
import com.moplus.moplus_server.admin.publish.dto.request.PublishPostRequest;
4+
import com.moplus.moplus_server.admin.publish.dto.response.PublishMonthGetResponse;
5+
import com.moplus.moplus_server.admin.publish.service.PublishDeleteService;
6+
import com.moplus.moplus_server.admin.publish.service.PublishGetService;
7+
import com.moplus.moplus_server.admin.publish.service.PublishSaveService;
88
import com.moplus.moplus_server.global.response.IdResponse;
99
import io.swagger.v3.oas.annotations.Operation;
1010
import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/com/moplus/moplus_server/domain/publish/domain/Publish.java src/main/java/com/moplus/moplus_server/admin/publish/domain/Publish.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.publish.domain;
1+
package com.moplus.moplus_server.admin.publish.domain;
22

33
import com.moplus.moplus_server.global.common.BaseEntity;
44
import com.moplus.moplus_server.global.error.exception.ErrorCode;

src/main/java/com/moplus/moplus_server/domain/publish/dto/request/PublishPostRequest.java src/main/java/com/moplus/moplus_server/admin/publish/dto/request/PublishPostRequest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.moplus.moplus_server.domain.publish.dto.request;
1+
package com.moplus.moplus_server.admin.publish.dto.request;
22

3-
import com.moplus.moplus_server.domain.publish.domain.Publish;
3+
import com.moplus.moplus_server.admin.publish.domain.Publish;
44
import jakarta.validation.constraints.NotNull;
55
import java.time.LocalDate;
66

src/main/java/com/moplus/moplus_server/domain/publish/dto/response/PublishMonthGetResponse.java src/main/java/com/moplus/moplus_server/admin/publish/dto/response/PublishMonthGetResponse.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.moplus.moplus_server.domain.publish.dto.response;
1+
package com.moplus.moplus_server.admin.publish.dto.response;
22

3-
import com.moplus.moplus_server.domain.publish.domain.Publish;
3+
import com.moplus.moplus_server.admin.publish.domain.Publish;
44
import java.time.LocalDate;
55
import lombok.Builder;
66

src/main/java/com/moplus/moplus_server/domain/publish/dto/response/PublishProblemSetResponse.java src/main/java/com/moplus/moplus_server/admin/publish/dto/response/PublishProblemSetResponse.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.moplus.moplus_server.domain.publish.dto.response;
1+
package com.moplus.moplus_server.admin.publish.dto.response;
22

33
import com.moplus.moplus_server.domain.problemset.domain.ProblemSet;
44
import lombok.Builder;

src/main/java/com/moplus/moplus_server/domain/publish/service/PublishDeleteService.java src/main/java/com/moplus/moplus_server/admin/publish/service/PublishDeleteService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.moplus.moplus_server.domain.publish.service;
1+
package com.moplus.moplus_server.admin.publish.service;
22

3-
import com.moplus.moplus_server.domain.publish.domain.Publish;
3+
import com.moplus.moplus_server.admin.publish.domain.Publish;
44
import com.moplus.moplus_server.domain.publish.repository.PublishRepository;
55
import lombok.RequiredArgsConstructor;
66
import org.springframework.stereotype.Service;

src/main/java/com/moplus/moplus_server/domain/publish/service/PublishGetService.java src/main/java/com/moplus/moplus_server/admin/publish/service/PublishGetService.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.moplus.moplus_server.domain.publish.service;
1+
package com.moplus.moplus_server.admin.publish.service;
22

33
import com.moplus.moplus_server.domain.problemset.domain.ProblemSet;
44
import com.moplus.moplus_server.domain.problemset.repository.ProblemSetRepository;
5-
import com.moplus.moplus_server.domain.publish.domain.Publish;
6-
import com.moplus.moplus_server.domain.publish.dto.response.PublishMonthGetResponse;
7-
import com.moplus.moplus_server.domain.publish.dto.response.PublishProblemSetResponse;
5+
import com.moplus.moplus_server.admin.publish.domain.Publish;
6+
import com.moplus.moplus_server.admin.publish.dto.response.PublishMonthGetResponse;
7+
import com.moplus.moplus_server.admin.publish.dto.response.PublishProblemSetResponse;
88
import com.moplus.moplus_server.domain.publish.repository.PublishRepository;
99
import com.moplus.moplus_server.global.error.exception.ErrorCode;
1010
import com.moplus.moplus_server.global.error.exception.InvalidValueException;

0 commit comments

Comments
 (0)