Merge remote-tracking branch 'origin/develop' into feat/#124

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Insert
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/main/java/com/insert/ioj/domain/Testcase/domain/Testcase.java

@@ -1,7 +1,15 @@
 package com.insert.ioj.domain.Testcase.domain;
 
 import com.insert.ioj.domain.problem.domain.Problem;
-import jakarta.persistence.*;
+import com.insert.ioj.global.entity.BaseTimeEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -11,7 +19,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-public class Testcase {
+public class Testcase extends BaseTimeEntity {
     @Id @GeneratedValue(strategy = GenerationType.UUID)
     private UUID id;
 

src/main/java/com/insert/ioj/domain/auth/presentation/AuthController.java

@@ -13,7 +13,13 @@
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
 
 @Tag(name = "Auth API")
 @RequiredArgsConstructor

src/main/java/com/insert/ioj/domain/compiler/presentation/dto/res/ProblemCompileResponse.java

@@ -1,12 +1,9 @@
 package com.insert.ioj.domain.compiler.presentation.dto.res;
 
-import com.insert.ioj.domain.contest.domain.Contest;
 import com.insert.ioj.domain.execution.domain.type.Verdict;
 import com.insert.ioj.domain.execution.language.Language;
 import com.insert.ioj.domain.problem.domain.Problem;
-import com.insert.ioj.domain.problemContest.domain.ProblemContest;
-import com.insert.ioj.domain.solve.domain.Solve;
-import com.insert.ioj.domain.solveContest.domain.SolveContest;
+import com.insert.ioj.domain.solve.solve.Solve;
 import com.insert.ioj.domain.user.domain.User;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

src/main/java/com/insert/ioj/domain/contest/domain/Contest.java

@@ -1,9 +1,15 @@
 package com.insert.ioj.domain.contest.domain;
 
 import com.insert.ioj.domain.user.domain.type.Authority;
+import com.insert.ioj.global.entity.BaseTimeEntity;
 import com.insert.ioj.global.error.exception.ErrorCode;
 import com.insert.ioj.global.error.exception.IojException;
-import jakarta.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -13,7 +19,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-public class Contest {
+public class Contest extends BaseTimeEntity {
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 

src/main/java/com/insert/ioj/domain/contest/domain/repository/ContestRepository.java

@@ -1,10 +1,7 @@
 package com.insert.ioj.domain.contest.domain.repository;
 
 import com.insert.ioj.domain.contest.domain.Contest;
-import com.insert.ioj.domain.contest.presentation.dto.res.ListContestAdminResponse;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/com/insert/ioj/domain/contest/presentation/ContestController.java

@@ -6,14 +6,24 @@
 import com.insert.ioj.domain.contest.presentation.dto.res.ListContestAdminResponse;
 import com.insert.ioj.domain.contest.presentation.dto.res.ListContestResponse;
 import com.insert.ioj.domain.contest.presentation.dto.res.RankingResponse;
-import com.insert.ioj.domain.contest.service.*;
+import com.insert.ioj.domain.contest.service.GetContestService;
+import com.insert.ioj.domain.contest.service.ListContestAdminService;
+import com.insert.ioj.domain.contest.service.ListContestService;
+import com.insert.ioj.domain.contest.service.RankingService;
+import com.insert.ioj.domain.contest.service.SaveContestService;
+import com.insert.ioj.domain.contest.service.SubmitContestService;
 import com.insert.ioj.domain.execution.domain.type.Verdict;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 

src/main/java/com/insert/ioj/domain/contest/presentation/dto/res/ListContestAdminResponse.java

@@ -3,7 +3,6 @@
 import com.insert.ioj.domain.contest.domain.Contest;
 import com.insert.ioj.domain.problem.domain.Problem;
 import com.insert.ioj.domain.user.domain.type.Authority;
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 

src/main/java/com/insert/ioj/domain/contest/service/RankingService.java

@@ -7,7 +7,7 @@
 import com.insert.ioj.domain.contest.presentation.dto.res.RankingResponse;
 import com.insert.ioj.domain.problem.facade.ProblemFacade;
 import com.insert.ioj.domain.problem.presentation.dto.res.ProblemStatusDto;
-import com.insert.ioj.domain.solveContest.domain.repository.CustomSolveContestRepository;
+import com.insert.ioj.domain.solve.contest.repository.CustomSolveContestRepository;
 import com.insert.ioj.domain.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/com/insert/ioj/domain/contest/service/SubmitContestService.java

@@ -12,9 +12,9 @@
 import com.insert.ioj.domain.execution.service.ExecutionService;
 import com.insert.ioj.domain.problem.domain.Problem;
 import com.insert.ioj.domain.problem.domain.repository.ProblemRepository;
-import com.insert.ioj.domain.solveContest.domain.SolveContest;
-import com.insert.ioj.domain.solveContest.domain.repository.CustomSolveContestRepository;
-import com.insert.ioj.domain.solveContest.domain.repository.SolveContestRepository;
+import com.insert.ioj.domain.solve.contest.SolveContest;
+import com.insert.ioj.domain.solve.contest.repository.CustomSolveContestRepository;
+import com.insert.ioj.domain.solve.contest.repository.SolveContestRepository;
 import com.insert.ioj.domain.user.domain.User;
 import com.insert.ioj.domain.user.facade.UserFacade;
 import com.insert.ioj.global.constants.FileConstants;

src/main/java/com/insert/ioj/domain/entry/domain/Entry.java

@@ -2,15 +2,21 @@
 
 import com.insert.ioj.domain.room.domain.Room;
 import com.insert.ioj.domain.user.domain.User;
-import jakarta.persistence.*;
+import com.insert.ioj.global.entity.BaseTimeEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-public class Entry {
+public class Entry extends BaseTimeEntity {
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private Boolean ready = false;

src/main/java/com/insert/ioj/domain/execution/language/CExecution.java

@@ -2,7 +2,6 @@
 
 import com.insert.ioj.domain.Testcase.domain.Testcase;
 import com.insert.ioj.domain.execution.domain.Execution;
-import com.insert.ioj.global.constants.CommandConstants;
 import com.insert.ioj.global.constants.ExtensionConstants;
 import com.insert.ioj.global.constants.FileConstants;
 import com.insert.ioj.infra.file.FileUtil;

src/main/java/com/insert/ioj/domain/execution/presentation/dto/res/TestcaseResult.java

@@ -4,7 +4,7 @@
 import com.insert.ioj.domain.execution.domain.type.Verdict;
 import com.insert.ioj.domain.execution.language.Language;
 import com.insert.ioj.domain.problem.domain.Problem;
-import com.insert.ioj.domain.solve.domain.Solve;
+import com.insert.ioj.domain.solve.solve.Solve;
 import com.insert.ioj.domain.user.domain.User;
 import lombok.Getter;
 

src/main/java/com/insert/ioj/domain/problem/domain/Problem.java

@@ -1,19 +1,26 @@
 package com.insert.ioj.domain.problem.domain;
 
-import jakarta.persistence.*;
+import com.insert.ioj.global.entity.BaseTimeEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Entity
-public class Problem {
+public class Problem extends BaseTimeEntity {
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     private String title;
 
+    private String source;
+
     @Column(columnDefinition = "TEXT")
     private String content;
 
@@ -29,9 +36,10 @@ public class Problem {
 
     private int timeLimit;
 
-    public Problem(String title, String content, String inputContent, String outputContent, int level, int memoryLimit, int timeLimit) {
+    public Problem(String title, String content, String source, String inputContent, String outputContent, int level, int memoryLimit, int timeLimit) {
         this.title = title;
         this.content = content;
+        this.source = source;
         this.inputContent = inputContent;
         this.outputContent = outputContent;
         this.level = level;

src/main/java/com/insert/ioj/domain/problem/facade/ProblemFacade.java

@@ -5,8 +5,8 @@
 import com.insert.ioj.domain.problem.domain.Problem;
 import com.insert.ioj.domain.problem.domain.repository.CustomProblemRepository;
 import com.insert.ioj.domain.problem.presentation.dto.res.ProblemStatusDto;
-import com.insert.ioj.domain.solveContest.domain.SolveContest;
-import com.insert.ioj.domain.solveContest.domain.repository.CustomSolveContestRepository;
+import com.insert.ioj.domain.solve.contest.SolveContest;
+import com.insert.ioj.domain.solve.contest.repository.CustomSolveContestRepository;
 import com.insert.ioj.domain.user.domain.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -47,7 +47,7 @@ private static List<ProblemStatusDto> getProblemStatus(List<Problem> problems,
                 status = "failed";
             }
 
-            LocalDateTime solveTime = solveContest != null ? solveContest.getCreateDate() : null;
+            LocalDateTime solveTime = solveContest != null ? solveContest.getCreatedAt() : null;
             problemStatuses.add(new ProblemStatusDto(problem, status, solveTime));
         }
         return problemStatuses;

src/main/java/com/insert/ioj/domain/problem/presentation/ProblemController.java

@@ -8,13 +8,23 @@
 import com.insert.ioj.domain.problem.presentation.dto.res.ListProblemResponse;
 import com.insert.ioj.domain.problem.presentation.dto.res.ProblemResponse;
 import com.insert.ioj.domain.problem.presentation.dto.res.TestcasesResponse;
-import com.insert.ioj.domain.problem.service.*;
+import com.insert.ioj.domain.problem.service.ExecutionProblemService;
+import com.insert.ioj.domain.problem.service.GetProblemService;
+import com.insert.ioj.domain.problem.service.ListProblemService;
+import com.insert.ioj.domain.problem.service.SaveProblemService;
+import com.insert.ioj.domain.problem.service.SubmitProblemService;
+import com.insert.ioj.domain.problem.service.VerifyTestcasesService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 

src/main/java/com/insert/ioj/domain/problem/presentation/dto/req/SaveProblemRequest.java

@@ -23,6 +23,9 @@ public class SaveProblemRequest {
     @NotNull(message = "content가 비어있습니다.")
     private String content;
 
+    @NotNull(message = "source가 비어있습니다.")
+    private String source;
+
     @NotNull(message = "inputContent가 비어있습니다.")
     private String inputContent;
 
@@ -47,7 +50,7 @@ public class SaveProblemRequest {
 
     public Problem toProblem() {
         return new Problem(
-            title, content, inputContent, outputContent, level, memoryLimit, timeLimit
+            title, content, source, inputContent, outputContent, level, memoryLimit, timeLimit
         );
     }
 

src/main/java/com/insert/ioj/domain/problem/presentation/dto/res/ListProblemResponse.java

@@ -10,10 +10,12 @@ public class ListProblemResponse {
     private Long id;
     private String title;
     private int level;
+    private String source;
 
     public ListProblemResponse(Problem problem) {
         this.id = problem.getId();
         this.title = problem.getTitle();
         this.level = problem.getLevel();
+        this.source = problem.getSource();
     }
 }

src/main/java/com/insert/ioj/domain/problem/presentation/dto/res/ProblemResponse.java

@@ -1,7 +1,6 @@
 package com.insert.ioj.domain.problem.presentation.dto.res;
 
 import com.insert.ioj.domain.problem.domain.Problem;
-import com.insert.ioj.domain.problem.presentation.dto.req.TestcaseDto;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
@@ -12,6 +11,7 @@
 public class ProblemResponse {
     private String title;
     private String content;
+    private String source;
     private String inputContent;
     private String outputContent;
     private int level;
@@ -22,6 +22,7 @@ public class ProblemResponse {
     public ProblemResponse(Problem problem, List<TestcaseResponse> testcases) {
         this.title = problem.getTitle();
         this.content = problem.getContent();
+        this.source = problem.getSource();
         this.inputContent = problem.getInputContent();
         this.outputContent = problem.getOutputContent();
         this.level = problem.getLevel();

src/main/java/com/insert/ioj/domain/problem/service/ExecutionProblemService.java

@@ -10,7 +10,7 @@
 import com.insert.ioj.domain.problem.domain.Problem;
 import com.insert.ioj.domain.problem.domain.repository.ProblemRepository;
 import com.insert.ioj.domain.problem.presentation.dto.req.ExecutionProblemRequest;
-import com.insert.ioj.domain.solve.domain.repository.SolveRepository;
+import com.insert.ioj.domain.solve.solve.repository.SolveRepository;
 import com.insert.ioj.domain.user.domain.User;
 import com.insert.ioj.domain.user.facade.UserFacade;
 import com.insert.ioj.global.constants.FileConstants;

src/main/java/com/insert/ioj/domain/problem/service/GetProblemService.java

@@ -3,7 +3,6 @@
 import com.insert.ioj.domain.Testcase.domain.repository.TestcaseRepository;
 import com.insert.ioj.domain.problem.domain.Problem;
 import com.insert.ioj.domain.problem.domain.repository.ProblemRepository;
-import com.insert.ioj.domain.problem.presentation.dto.req.TestcaseDto;
 import com.insert.ioj.domain.problem.presentation.dto.res.ProblemResponse;
 import com.insert.ioj.domain.problem.presentation.dto.res.TestcaseResponse;
 import com.insert.ioj.global.error.exception.ErrorCode;

src/main/java/com/insert/ioj/domain/problem/service/SubmitProblemService.java

@@ -7,7 +7,7 @@
 import com.insert.ioj.domain.problem.domain.Problem;
 import com.insert.ioj.domain.problem.domain.repository.ProblemRepository;
 import com.insert.ioj.domain.problem.presentation.dto.req.SubmitProblemRequest;
-import com.insert.ioj.domain.solve.domain.repository.SolveRepository;
+import com.insert.ioj.domain.solve.solve.repository.SolveRepository;
 import com.insert.ioj.domain.user.domain.User;
 import com.insert.ioj.domain.user.facade.UserFacade;
 import com.insert.ioj.global.error.exception.ErrorCode;