Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.time.LocalDateTime;
import kr.allcll.backend.domain.notice.Notice;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationType;

public record AdminNoticeResponse(
long id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import kr.allcll.backend.domain.notice.Notice;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationType;

public record CreateNoticeRequest(
@NotBlank
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.time.LocalDateTime;
import kr.allcll.backend.domain.notice.Notice;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationType;

public record CreateNoticeResponse(
long id,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package kr.allcll.backend.admin.notice.dto;

import jakarta.validation.constraints.Size;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationType;

public record UpdateNoticeRequest(
@Size(max = 250)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.time.LocalDateTime;
import kr.allcll.backend.domain.notice.Notice;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationType;

public record UpdateNoticeResponse(
long id,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
package kr.allcll.backend.admin.operationPeriod;
package kr.allcll.backend.admin.operationperiod;

import jakarta.servlet.http.HttpServletRequest;
import kr.allcll.backend.admin.AdminRequestValidator;
import kr.allcll.backend.admin.operationPeriod.dto.OperationPeriodRequest;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.admin.operationperiod.dto.OperationPeriodRequest;
import kr.allcll.backend.domain.operationperiod.OperationType;
import kr.allcll.backend.support.semester.Semester;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.DeleteMapping;
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package kr.allcll.backend.admin.operationPeriod;
package kr.allcll.backend.admin.operationperiod;

import java.util.Optional;
import kr.allcll.backend.admin.operationPeriod.dto.OperationPeriodRequest;
import kr.allcll.backend.domain.operationPeriod.OperationPeriod;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationPeriod.OperationPeriodRepository;
import kr.allcll.backend.admin.operationperiod.dto.OperationPeriodRequest;
import kr.allcll.backend.domain.operationperiod.OperationPeriod;
import kr.allcll.backend.domain.operationperiod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationPeriodRepository;
import kr.allcll.backend.support.semester.Semester;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package kr.allcll.backend.admin.operationPeriod.dto;
package kr.allcll.backend.admin.operationperiod.dto;

import java.time.LocalDateTime;
import kr.allcll.backend.domain.operationPeriod.OperationPeriod;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationPeriod;
import kr.allcll.backend.domain.operationperiod.OperationType;
import kr.allcll.backend.support.semester.Semester;

public record OperationPeriodRequest(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package kr.allcll.backend.admin.review.dto;

import kr.allcll.backend.domain.operationperiod.OperationType;
import java.time.LocalDateTime;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.review.UserReview;

public record AdminUserReviewResponse(
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/kr/allcll/backend/domain/notice/Notice.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationType;
import kr.allcll.backend.support.entity.BaseEntity;
import lombok.AccessLevel;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.time.LocalDateTime;
import kr.allcll.backend.domain.notice.Notice;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationType;

public record NoticeResponse(
long id,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kr.allcll.backend.domain.operationPeriod;
package kr.allcll.backend.domain.operationperiod;

import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package kr.allcll.backend.domain.operationPeriod;
package kr.allcll.backend.domain.operationperiod;

import java.time.LocalDate;
import kr.allcll.backend.domain.operationPeriod.dto.OperationPeriodsResponse;
import kr.allcll.backend.domain.operationperiod.dto.OperationPeriodsResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kr.allcll.backend.domain.operationPeriod;
package kr.allcll.backend.domain.operationperiod;

import java.util.List;
import java.util.Optional;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package kr.allcll.backend.domain.operationPeriod;
package kr.allcll.backend.domain.operationperiod;

import java.time.LocalDate;
import java.util.List;
import kr.allcll.backend.domain.operationPeriod.dto.OperationPeriodsResponse;
import kr.allcll.backend.domain.operationperiod.dto.OperationPeriodsResponse;
import kr.allcll.backend.support.semester.Semester;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kr.allcll.backend.domain.operationPeriod;
package kr.allcll.backend.domain.operationperiod;

import lombok.Getter;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package kr.allcll.backend.domain.operationPeriod.dto;
package kr.allcll.backend.domain.operationperiod.dto;


import java.time.LocalDateTime;
import kr.allcll.backend.domain.operationPeriod.OperationPeriod;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationPeriod;
import kr.allcll.backend.domain.operationperiod.OperationType;

public record OperationPeriodDetailResponse(
OperationType operationType,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package kr.allcll.backend.domain.operationPeriod.dto;
package kr.allcll.backend.domain.operationperiod.dto;

import java.util.List;
import kr.allcll.backend.domain.operationPeriod.OperationPeriod;
import kr.allcll.backend.domain.operationperiod.OperationPeriod;
import kr.allcll.backend.support.semester.Semester;

public record OperationPeriodsResponse(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationType;
import kr.allcll.backend.support.entity.BaseEntity;
import lombok.AccessLevel;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package kr.allcll.backend.domain.review.dto;

import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationType;

public record UserReviewRequest(
Short rate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import kr.allcll.backend.admin.notice.dto.UpdateNoticeResponse;
import kr.allcll.backend.domain.notice.Notice;
import kr.allcll.backend.domain.notice.NoticeRepository;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationType;
import kr.allcll.backend.support.exception.AllcllErrorCode;
import kr.allcll.backend.support.exception.AllcllException;
import org.junit.jupiter.api.AfterEach;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import kr.allcll.backend.admin.notice.dto.UpdateNoticeResponse;
import kr.allcll.backend.domain.notice.Notice;
import kr.allcll.backend.domain.notice.NoticeRepository;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationType;
import kr.allcll.backend.support.exception.AllcllErrorCode;
import kr.allcll.backend.support.exception.AllcllException;
import org.junit.jupiter.api.DisplayName;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package kr.allcll.backend.admin.operationPeriod;
package kr.allcll.backend.admin.operationperiod;

import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.when;
Expand All @@ -10,8 +10,8 @@
import jakarta.servlet.http.HttpServletRequest;
import java.time.LocalDateTime;
import kr.allcll.backend.admin.AdminRequestValidator;
import kr.allcll.backend.admin.operationPeriod.dto.OperationPeriodRequest;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.admin.operationperiod.dto.OperationPeriodRequest;
import kr.allcll.backend.domain.operationperiod.OperationType;
import kr.allcll.backend.support.semester.Semester;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package kr.allcll.backend.admin.operationPeriod;
package kr.allcll.backend.admin.operationperiod;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatCode;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import java.time.LocalDateTime;
import java.util.Optional;
import kr.allcll.backend.admin.operationPeriod.dto.OperationPeriodRequest;
import kr.allcll.backend.domain.operationPeriod.OperationPeriod;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationPeriod.OperationPeriodRepository;
import kr.allcll.backend.admin.operationperiod.dto.OperationPeriodRequest;
import kr.allcll.backend.domain.operationperiod.OperationPeriod;
import kr.allcll.backend.domain.operationperiod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationPeriodRepository;
import kr.allcll.backend.support.semester.Semester;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.DisplayName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import java.util.List;
import kr.allcll.backend.domain.notice.dto.NoticesResponse;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationType;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.util.List;
import kr.allcll.backend.domain.graduation.certification.CodingTargetType;
import kr.allcll.backend.domain.graduation.department.GraduationDepartmentInfo;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationType;
import kr.allcll.backend.domain.review.dto.UserReviewRequest;
import kr.allcll.backend.domain.user.User;
import kr.allcll.backend.domain.user.UserRepository;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.time.LocalDateTime;
import kr.allcll.backend.domain.notice.Notice;
import kr.allcll.backend.domain.notice.NoticeRepository;
import kr.allcll.backend.domain.operationPeriod.OperationType;
import kr.allcll.backend.domain.operationperiod.OperationType;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
Expand Down
Loading