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
@@ -1,6 +1,6 @@
package com.threestar.trainus.domain.comment.entity;

import com.threestar.trainus.domain.lesson.admin.entity.Lesson;
import com.threestar.trainus.domain.lesson.teacher.entity.Lesson;
import com.threestar.trainus.domain.user.entity.User;
import com.threestar.trainus.global.entity.BaseDateEntity;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import com.threestar.trainus.domain.comment.entity.Comment;
import com.threestar.trainus.domain.comment.mapper.CommentMapper;
import com.threestar.trainus.domain.comment.repository.CommentRepository;
import com.threestar.trainus.domain.lesson.admin.entity.Lesson;
import com.threestar.trainus.domain.lesson.admin.service.AdminLessonService;
import com.threestar.trainus.domain.lesson.teacher.entity.Lesson;
import com.threestar.trainus.domain.lesson.teacher.service.AdminLessonService;
import com.threestar.trainus.domain.user.entity.User;
import com.threestar.trainus.domain.user.service.UserService;
import com.threestar.trainus.global.utils.PageLimitCalculator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.threestar.trainus.domain.lesson.admin.entity.Category;
import com.threestar.trainus.domain.lesson.student.dto.LessonApplicationResponseDto;
import com.threestar.trainus.domain.lesson.student.dto.LessonDetailResponseDto;
import com.threestar.trainus.domain.lesson.student.dto.LessonSearchListResponseDto;
Expand All @@ -20,6 +19,7 @@
import com.threestar.trainus.domain.lesson.student.dto.MyLessonApplicationListResponseDto;
import com.threestar.trainus.domain.lesson.student.dto.MyLessonApplicationListWrapperDto;
import com.threestar.trainus.domain.lesson.student.service.StudentLessonService;
import com.threestar.trainus.domain.lesson.teacher.entity.Category;
import com.threestar.trainus.global.annotation.LoginUser;
import com.threestar.trainus.global.dto.PageRequestDto;
import com.threestar.trainus.global.exception.domain.ErrorCode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.time.LocalDateTime;

import com.threestar.trainus.domain.lesson.admin.entity.ApplicationStatus;
import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationStatus;

import lombok.Builder;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import java.time.LocalDateTime;
import java.util.List;

import com.threestar.trainus.domain.lesson.admin.entity.Category;
import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus;
import com.threestar.trainus.domain.lesson.teacher.entity.Category;
import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus;

import lombok.Builder;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import java.time.LocalDateTime;
import java.util.List;

import com.threestar.trainus.domain.lesson.admin.entity.Category;
import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus;
import com.threestar.trainus.domain.lesson.teacher.entity.Category;
import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus;

public record LessonSearchResponseDto(
long id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.time.LocalDateTime;

import com.threestar.trainus.domain.lesson.admin.entity.ApplicationStatus;
import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationStatus;

import lombok.Builder;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import java.util.List;

import com.threestar.trainus.domain.lesson.admin.entity.LessonApplication;
import com.threestar.trainus.domain.lesson.student.dto.LessonSummaryResponseDto;
import com.threestar.trainus.domain.lesson.student.dto.MyLessonApplicationListResponseDto;
import com.threestar.trainus.domain.lesson.student.dto.MyLessonApplicationResponseDto;
import com.threestar.trainus.domain.lesson.teacher.entity.LessonApplication;

import lombok.AccessLevel;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.time.LocalDateTime;

import com.threestar.trainus.domain.lesson.admin.entity.ApplicationStatus;
import com.threestar.trainus.domain.lesson.student.dto.LessonApplicationResponseDto;
import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationStatus;

import lombok.AccessLevel;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.util.List;

import com.threestar.trainus.domain.lesson.admin.entity.Lesson;
import com.threestar.trainus.domain.lesson.student.dto.LessonSearchResponseDto;
import com.threestar.trainus.domain.lesson.teacher.entity.Lesson;
import com.threestar.trainus.domain.metadata.dto.ProfileMetadataResponseDto;
import com.threestar.trainus.domain.profile.entity.Profile;
import com.threestar.trainus.domain.user.entity.User;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.threestar.trainus.domain.lesson.student.mapper;

import com.threestar.trainus.domain.lesson.admin.entity.Lesson;
import com.threestar.trainus.domain.lesson.student.dto.LessonSimpleResponseDto;
import com.threestar.trainus.domain.lesson.teacher.entity.Lesson;

import lombok.AccessLevel;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,6 @@
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

import com.threestar.trainus.domain.lesson.admin.entity.ApplicationStatus;
import com.threestar.trainus.domain.lesson.admin.entity.Category;
import com.threestar.trainus.domain.lesson.admin.entity.Lesson;
import com.threestar.trainus.domain.lesson.admin.entity.LessonApplication;
import com.threestar.trainus.domain.lesson.admin.entity.LessonImage;
import com.threestar.trainus.domain.lesson.admin.entity.LessonParticipant;
import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus;
import com.threestar.trainus.domain.lesson.admin.mapper.LessonMapper;
import com.threestar.trainus.domain.lesson.admin.repository.LessonApplicationRepository;
import com.threestar.trainus.domain.lesson.admin.repository.LessonImageRepository;
import com.threestar.trainus.domain.lesson.admin.repository.LessonParticipantRepository;
import com.threestar.trainus.domain.lesson.admin.repository.LessonRepository;
import com.threestar.trainus.domain.lesson.admin.service.AdminLessonService;
import com.threestar.trainus.domain.lesson.student.dto.LessonApplicationResponseDto;
import com.threestar.trainus.domain.lesson.student.dto.LessonDetailResponseDto;
import com.threestar.trainus.domain.lesson.student.dto.LessonSearchListResponseDto;
Expand All @@ -30,6 +17,19 @@
import com.threestar.trainus.domain.lesson.student.mapper.LessonApplyMapper;
import com.threestar.trainus.domain.lesson.student.mapper.LessonSearchMapper;
import com.threestar.trainus.domain.lesson.student.mapper.LessonSimpleMapper;
import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationStatus;
import com.threestar.trainus.domain.lesson.teacher.entity.Category;
import com.threestar.trainus.domain.lesson.teacher.entity.Lesson;
import com.threestar.trainus.domain.lesson.teacher.entity.LessonApplication;
import com.threestar.trainus.domain.lesson.teacher.entity.LessonImage;
import com.threestar.trainus.domain.lesson.teacher.entity.LessonParticipant;
import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus;
import com.threestar.trainus.domain.lesson.teacher.mapper.LessonMapper;
import com.threestar.trainus.domain.lesson.teacher.repository.LessonApplicationRepository;
import com.threestar.trainus.domain.lesson.teacher.repository.LessonImageRepository;
import com.threestar.trainus.domain.lesson.teacher.repository.LessonParticipantRepository;
import com.threestar.trainus.domain.lesson.teacher.repository.LessonRepository;
import com.threestar.trainus.domain.lesson.teacher.service.AdminLessonService;
import com.threestar.trainus.domain.metadata.dto.ProfileMetadataResponseDto;
import com.threestar.trainus.domain.metadata.service.ProfileMetadataService;
import com.threestar.trainus.domain.profile.entity.Profile;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.controller;
package com.threestar.trainus.domain.lesson.teacher.controller;

import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
Expand All @@ -12,21 +12,21 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import com.threestar.trainus.domain.lesson.admin.dto.ApplicationActionRequestDto;
import com.threestar.trainus.domain.lesson.admin.dto.ApplicationProcessResponseDto;
import com.threestar.trainus.domain.lesson.admin.dto.CreatedLessonListResponseDto;
import com.threestar.trainus.domain.lesson.admin.dto.CreatedLessonListWrapperDto;
import com.threestar.trainus.domain.lesson.admin.dto.LessonApplicationListResponseDto;
import com.threestar.trainus.domain.lesson.admin.dto.LessonApplicationListWrapperDto;
import com.threestar.trainus.domain.lesson.admin.dto.LessonCreateRequestDto;
import com.threestar.trainus.domain.lesson.admin.dto.LessonResponseDto;
import com.threestar.trainus.domain.lesson.admin.dto.ParticipantListResponseDto;
import com.threestar.trainus.domain.lesson.admin.dto.ParticipantListWrapperDto;
import com.threestar.trainus.domain.lesson.admin.entity.ApplicationAction;
import com.threestar.trainus.domain.lesson.admin.mapper.CreatedLessonMapper;
import com.threestar.trainus.domain.lesson.admin.mapper.LessonApplicationMapper;
import com.threestar.trainus.domain.lesson.admin.mapper.LessonParticipantMapper;
import com.threestar.trainus.domain.lesson.admin.service.AdminLessonService;
import com.threestar.trainus.domain.lesson.teacher.dto.ApplicationActionRequestDto;
import com.threestar.trainus.domain.lesson.teacher.dto.ApplicationProcessResponseDto;
import com.threestar.trainus.domain.lesson.teacher.dto.CreatedLessonListResponseDto;
import com.threestar.trainus.domain.lesson.teacher.dto.CreatedLessonListWrapperDto;
import com.threestar.trainus.domain.lesson.teacher.dto.LessonApplicationListResponseDto;
import com.threestar.trainus.domain.lesson.teacher.dto.LessonApplicationListWrapperDto;
import com.threestar.trainus.domain.lesson.teacher.dto.LessonCreateRequestDto;
import com.threestar.trainus.domain.lesson.teacher.dto.LessonResponseDto;
import com.threestar.trainus.domain.lesson.teacher.dto.ParticipantListResponseDto;
import com.threestar.trainus.domain.lesson.teacher.dto.ParticipantListWrapperDto;
import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationAction;
import com.threestar.trainus.domain.lesson.teacher.mapper.CreatedLessonMapper;
import com.threestar.trainus.domain.lesson.teacher.mapper.LessonApplicationMapper;
import com.threestar.trainus.domain.lesson.teacher.mapper.LessonParticipantMapper;
import com.threestar.trainus.domain.lesson.teacher.service.AdminLessonService;
import com.threestar.trainus.global.annotation.LoginUser;
import com.threestar.trainus.global.dto.PageRequestDto;
import com.threestar.trainus.global.exception.domain.ErrorCode;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.controller;
package com.threestar.trainus.domain.lesson.teacher.controller;

import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
Expand All @@ -8,7 +8,7 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

import com.threestar.trainus.domain.lesson.admin.service.LocationCsvService;
import com.threestar.trainus.domain.lesson.teacher.service.LocationCsvService;

import io.swagger.v3.oas.annotations.Operation;
import lombok.RequiredArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.threestar.trainus.domain.lesson.admin.dto;
package com.threestar.trainus.domain.lesson.teacher.dto;

import com.threestar.trainus.domain.lesson.admin.entity.ApplicationAction;
import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationAction;

import jakarta.validation.constraints.NotNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.threestar.trainus.domain.lesson.admin.dto;
package com.threestar.trainus.domain.lesson.teacher.dto;

import java.time.LocalDateTime;

import com.threestar.trainus.domain.lesson.admin.entity.ApplicationStatus;
import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationStatus;

import lombok.Builder;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.threestar.trainus.domain.lesson.admin.dto;
package com.threestar.trainus.domain.lesson.teacher.dto;

import java.time.LocalDateTime;

import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus;
import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus;

import lombok.Builder;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.dto;
package com.threestar.trainus.domain.lesson.teacher.dto;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.dto;
package com.threestar.trainus.domain.lesson.teacher.dto;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.dto;
package com.threestar.trainus.domain.lesson.teacher.dto;

import lombok.Builder;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.dto;
package com.threestar.trainus.domain.lesson.teacher.dto;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.threestar.trainus.domain.lesson.admin.dto;
package com.threestar.trainus.domain.lesson.teacher.dto;

import java.time.LocalDateTime;

import com.threestar.trainus.domain.lesson.admin.entity.ApplicationStatus;
import com.threestar.trainus.domain.lesson.teacher.entity.ApplicationStatus;
import com.threestar.trainus.domain.profile.dto.ProfileResponseDto;

import lombok.Builder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.threestar.trainus.domain.lesson.admin.dto;
package com.threestar.trainus.domain.lesson.teacher.dto;

import java.time.LocalDateTime;
import java.util.List;

import com.threestar.trainus.domain.lesson.admin.entity.Category;
import com.threestar.trainus.domain.lesson.teacher.entity.Category;

import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.threestar.trainus.domain.lesson.admin.dto;
package com.threestar.trainus.domain.lesson.teacher.dto;

import java.time.LocalDateTime;
import java.util.List;

import com.threestar.trainus.domain.lesson.admin.entity.Category;
import com.threestar.trainus.domain.lesson.admin.entity.LessonStatus;
import com.threestar.trainus.domain.lesson.teacher.entity.Category;
import com.threestar.trainus.domain.lesson.teacher.entity.LessonStatus;

import lombok.Builder;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.dto;
package com.threestar.trainus.domain.lesson.teacher.dto;

import java.time.LocalDateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.dto;
package com.threestar.trainus.domain.lesson.teacher.dto;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.dto;
package com.threestar.trainus.domain.lesson.teacher.dto;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.entity;
package com.threestar.trainus.domain.lesson.teacher.entity;

/**
* 강사가 레슨 신청에 대해 승인, 거절을 선택할 수 있음
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.entity;
package com.threestar.trainus.domain.lesson.teacher.entity;

/**
* 레슨 신청 상태를 나타내는 enum
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.entity;
package com.threestar.trainus.domain.lesson.teacher.entity;

public enum Category {
GYM,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.entity;
package com.threestar.trainus.domain.lesson.teacher.entity;

import java.time.LocalDateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.entity;
package com.threestar.trainus.domain.lesson.teacher.entity;

import com.threestar.trainus.domain.user.entity.User;
import com.threestar.trainus.global.entity.BaseDateEntity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.entity;
package com.threestar.trainus.domain.lesson.teacher.entity;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.entity;
package com.threestar.trainus.domain.lesson.teacher.entity;

import java.time.LocalDateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.entity;
package com.threestar.trainus.domain.lesson.teacher.entity;

/**
* 레슨 진행 상태를 나태내는 enum
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.threestar.trainus.domain.lesson.admin.entity;
package com.threestar.trainus.domain.lesson.teacher.entity;

import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.threestar.trainus.domain.lesson.admin.mapper;
package com.threestar.trainus.domain.lesson.teacher.mapper;

import java.util.List;

import com.threestar.trainus.domain.lesson.admin.dto.CreatedLessonDto;
import com.threestar.trainus.domain.lesson.admin.dto.CreatedLessonListResponseDto;
import com.threestar.trainus.domain.lesson.admin.dto.CreatedLessonListWrapperDto;
import com.threestar.trainus.domain.lesson.admin.entity.Lesson;
import com.threestar.trainus.domain.lesson.teacher.dto.CreatedLessonDto;
import com.threestar.trainus.domain.lesson.teacher.dto.CreatedLessonListResponseDto;
import com.threestar.trainus.domain.lesson.teacher.dto.CreatedLessonListWrapperDto;
import com.threestar.trainus.domain.lesson.teacher.entity.Lesson;

public class CreatedLessonMapper {

Expand Down
Loading