Skip to content

Commit

Permalink
πŸ”— :: (#481) spring 3.0 λ§ˆμ΄κ·Έλ ˆμ΄μ…˜
Browse files Browse the repository at this point in the history
πŸ”— :: (#481) spring 3.0 λ§ˆμ΄κ·Έλ ˆμ΄μ…˜
  • Loading branch information
geunoo authored Dec 4, 2023
2 parents 7593458 + 9df10df commit 051368e
Show file tree
Hide file tree
Showing 90 changed files with 500 additions and 493 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'org.springframework.boot' version '2.7.4'
id 'org.springframework.boot' version '3.2.0'
id 'java'
id "org.sonarqube" version "3.5.0.2730"
id 'jacoco'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

import java.util.List;

@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class NumberUtil {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import team.retum.jobis.common.annotation.Aggregate;
import team.retum.jobis.domain.student.exception.ClassRoomNotFoundException;

import java.time.Period;
import java.time.Year;

@Getter
Expand Down
13 changes: 9 additions & 4 deletions jobis-infrastructure/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ dependencies {
implementation(project(":jobis-application"))

//persistence
runtimeOnly 'mysql:mysql-connector-java'
runtimeOnly 'com.mysql:mysql-connector-j'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-data-redis'

//queryDSL
implementation 'com.querydsl:querydsl-jpa'
implementation "com.querydsl:querydsl-jpa:5.0.0:jakarta"
annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta"
annotationProcessor(
"javax.persistence:javax.persistence-api",
"javax.annotation:javax.annotation-api",
"jakarta.persistence:jakarta.persistence-api",
"jakarta.annotation:jakarta.annotation-api",
"com.querydsl:querydsl-apt:5.0.0:jpa")

//web
Expand Down Expand Up @@ -49,6 +50,10 @@ dependencies {

// slack
implementation 'net.gpedro.integrations.slack:slack-webhook:1.4.0'

// jaxb
implementation 'javax.xml.bind:jaxb-api:2.3.0'

}

test.useJUnitPlatform()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
package team.retum.jobis;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
import org.springframework.cloud.commons.httpclient.HttpClientConfiguration;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.cloud.openfeign.FeignAutoConfiguration;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.scheduling.annotation.EnableScheduling;

@ConfigurationPropertiesScan
@EnableFeignClients
@ImportAutoConfiguration({FeignAutoConfiguration.class, HttpClientConfiguration.class})
@SpringBootApplication
@EnableJpaAuditing
@EnableScheduling
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
package team.retum.jobis.domain.acceptance.persistence.entity;

import jakarta.persistence.Column;
import jakarta.persistence.Convert;
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 jakarta.persistence.Table;
import jakarta.validation.constraints.NotNull;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
Expand All @@ -8,17 +19,6 @@
import team.retum.jobis.domain.student.persistence.entity.StudentEntity;
import team.retum.jobis.global.converter.StringListConverter;

import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import java.time.LocalDate;
import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package team.retum.jobis.domain.acceptance.presentation;

import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.DeleteMapping;
Expand All @@ -22,8 +23,6 @@
import team.retum.jobis.domain.acceptance.usecase.RegisterFieldTraineeUseCase;
import team.retum.jobis.domain.acceptance.usecase.TeacherQueryFieldTraineesAndContractWorkersUseCase;

import javax.validation.Valid;

@RequiredArgsConstructor
@RequestMapping("/acceptances")
@RestController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package team.retum.jobis.domain.acceptance.presentation.dto.request;

import jakarta.validation.constraints.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
import team.retum.jobis.domain.acceptance.dto.request.ChangeContractDateRequest;
import team.retum.jobis.global.annotation.ValidListElements;

import javax.validation.constraints.NotNull;
import java.time.LocalDate;
import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package team.retum.jobis.domain.acceptance.presentation.dto.request;

import jakarta.validation.constraints.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
import team.retum.jobis.domain.acceptance.dto.request.RegisterFieldTraineeRequest;
import team.retum.jobis.global.annotation.ValidListElements;

import javax.validation.constraints.NotNull;
import java.time.LocalDate;
import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
package team.retum.jobis.domain.application.persistence.entity;

import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.validation.constraints.NotNull;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import team.retum.jobis.domain.application.model.AttachmentType;

import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.validation.constraints.NotNull;

@Getter
@AllArgsConstructor
@NoArgsConstructor(access = AccessLevel.PROTECTED)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
package team.retum.jobis.domain.application.persistence.entity;

import jakarta.persistence.CollectionTable;
import jakarta.persistence.Column;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
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 jakarta.persistence.Table;
import jakarta.validation.constraints.NotNull;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
Expand All @@ -9,20 +23,6 @@
import team.retum.jobis.domain.student.persistence.entity.StudentEntity;
import team.retum.jobis.global.entity.BaseTimeEntity;

import javax.persistence.CollectionTable;
import javax.persistence.Column;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package team.retum.jobis.domain.application.presentation;

import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.DeleteMapping;
Expand Down Expand Up @@ -27,9 +28,9 @@
import team.retum.jobis.domain.application.presentation.dto.request.RejectApplicationWebRequest;
import team.retum.jobis.domain.application.usecase.ChangeApplicationsStatusUseCase;
import team.retum.jobis.domain.application.usecase.ChangeFieldTrainDateUseCase;
import team.retum.jobis.domain.application.usecase.CompanyQueryApplicationsUseCase;
import team.retum.jobis.domain.application.usecase.CreateApplicationUseCase;
import team.retum.jobis.domain.application.usecase.DeleteApplicationUseCase;
import team.retum.jobis.domain.application.usecase.CompanyQueryApplicationsUseCase;
import team.retum.jobis.domain.application.usecase.QueryEmploymentCountUseCase;
import team.retum.jobis.domain.application.usecase.QueryPassedApplicationStudentsUseCase;
import team.retum.jobis.domain.application.usecase.QueryRejectionReasonUseCase;
Expand All @@ -38,8 +39,6 @@
import team.retum.jobis.domain.application.usecase.RejectApplicationUseCase;
import team.retum.jobis.domain.application.usecase.TeacherQueryApplicationsUseCase;

import javax.validation.Valid;

@RequiredArgsConstructor
@RequestMapping("/applications")
@RestController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package team.retum.jobis.domain.application.presentation.dto.request;

import jakarta.validation.constraints.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
import team.retum.jobis.domain.application.model.ApplicationStatus;

import javax.validation.constraints.NotNull;
import java.util.List;

@Getter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package team.retum.jobis.domain.application.presentation.dto.request;

import jakarta.validation.constraints.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
import team.retum.jobis.domain.application.dto.request.ChangeFieldTrainDateRequest;
import team.retum.jobis.global.annotation.ValidListElements;

import javax.validation.constraints.NotNull;
import java.time.LocalDate;
import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package team.retum.jobis.domain.application.presentation.dto.request;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
import team.retum.jobis.domain.application.dto.request.CreateApplicationRequest;
import team.retum.jobis.domain.application.dto.request.CreateApplicationRequest.AttachmentRequest;
import team.retum.jobis.domain.application.model.AttachmentType;
import team.retum.jobis.global.annotation.ValidListElements;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List;

@Getter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package team.retum.jobis.domain.application.presentation.dto.request;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Builder;
import lombok.Getter;
import team.retum.jobis.domain.application.model.ApplicationStatus;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

@Getter
@Builder
public class QueryApplicationsWebRequest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package team.retum.jobis.domain.application.presentation.dto.request;


import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import lombok.Getter;
import lombok.NoArgsConstructor;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;

@Getter
@NoArgsConstructor
public class RejectApplicationWebRequest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package team.retum.jobis.domain.auth.presentation;

import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.PatchMapping;
Expand All @@ -17,8 +18,6 @@
import team.retum.jobis.domain.auth.usecase.TokenReissueUseCase;
import team.retum.jobis.domain.auth.usecase.VerifyAuthCodeUseCase;

import javax.validation.Valid;

@RequiredArgsConstructor
@RequestMapping("/auth")
@RestController
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package team.retum.jobis.domain.auth.presentation.dto.request;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Pattern;
import lombok.Getter;
import lombok.NoArgsConstructor;
import team.retum.jobis.domain.auth.dto.SendAuthCodeRequest;
import team.retum.jobis.domain.auth.model.AuthCodeType;
import team.retum.jobis.global.util.RegexProperty;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;

@Getter
@NoArgsConstructor
public class SendAuthCodeWebRequest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package team.retum.jobis.domain.auth.presentation.dto.request;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import jakarta.validation.constraints.Size;
import lombok.Getter;
import lombok.NoArgsConstructor;
import team.retum.jobis.global.util.RegexProperty;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;

@Getter
@NoArgsConstructor
public class VerifyAuthCodeWebRequest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
package team.retum.jobis.domain.bookmark.persistence.entity;

import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.Id;
import jakarta.persistence.IdClass;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
Expand All @@ -8,14 +15,6 @@
import team.retum.jobis.domain.student.persistence.entity.StudentEntity;
import team.retum.jobis.global.entity.BaseTimeEntity;

import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Id;
import javax.persistence.IdClass;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;

@Getter
@AllArgsConstructor
@NoArgsConstructor(access = AccessLevel.PROTECTED)
Expand Down
Loading

0 comments on commit 051368e

Please sign in to comment.