Skip to content

[Fix] 질문 관리 에러 수정 #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seungzzok merged 3 commits into from
Apr 23, 2025
Merged

[Fix] 질문 관리 에러 수정 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52b3010
refactor: local 디렉토리 위치 이동
seungzzok Apr 23, 2025
7329144
rename: SpecialQuestion -> SpecialQuestionDto
seungzzok Apr 23, 2025
1b35b47
fix: 질문 관리 에러 수정
seungzzok Apr 23, 2025
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
2 changes: 1 addition & 1 deletion src/main/java/com/writon/admin/domain/controller/ChallengeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import com.writon.admin.domain.dto.response.challenge.ChallengeInfoResponseDto;
import com.writon.admin.domain.dto.response.challenge.CreateChallengeResponseDto;
import com.writon.admin.domain.dto.response.challenge.QuestionsResponseDto;
import com.writon.admin.domain.entity.lcoal.UserStatus;
import com.writon.admin.domain.dto.lcoal.UserStatus;
import com.writon.admin.domain.service.ChallengeService;
import com.writon.admin.global.response.SuccessDto;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/writon/admin/domain/controller/ParticipationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.writon.admin.domain.controller;

import com.writon.admin.domain.entity.lcoal.ParticipationInfo;
import com.writon.admin.domain.dto.lcoal.ParticipationInfo;
import com.writon.admin.domain.service.EmailService;
import com.writon.admin.domain.service.ParticipationService;
import com.writon.admin.global.error.CustomException;
Expand Down
2 changes: 1 addition & 1 deletion ...omain/entity/lcoal/ChallengeResponse.java → ...n/domain/dto/lcoal/ChallengeResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.writon.admin.domain.entity.lcoal;
package com.writon.admin.domain.dto.lcoal;

import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
2 changes: 1 addition & 1 deletion ...omain/entity/lcoal/ParticipationInfo.java → ...n/domain/dto/lcoal/ParticipationInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.writon.admin.domain.entity.lcoal;
package com.writon.admin.domain.dto.lcoal;

import java.time.LocalDate;
import lombok.AllArgsConstructor;
Expand Down
5 changes: 3 additions & 2 deletions .../domain/entity/lcoal/SpecialQuestion.java → .../domain/dto/lcoal/SpecialQuestionDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package com.writon.admin.domain.entity.lcoal;
package com.writon.admin.domain.dto.lcoal;

import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;

@Getter
@AllArgsConstructor
public class SpecialQuestion {
public class SpecialQuestionDto {

private Long keywordId;
private String keyword;
private List<String> questions;

Expand Down
2 changes: 1 addition & 1 deletion ...ton/admin/domain/entity/lcoal/Status.java → ...writon/admin/domain/dto/lcoal/Status.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.writon.admin.domain.entity.lcoal;
package com.writon.admin.domain.dto.lcoal;

import java.time.LocalDate;
import lombok.AllArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion ...admin/domain/entity/lcoal/UserStatus.java → ...on/admin/domain/dto/lcoal/UserStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.writon.admin.domain.entity.lcoal;
package com.writon.admin.domain.dto.lcoal;

import java.util.List;
import lombok.AllArgsConstructor;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/writon/admin/domain/dto/request/challenge/CreateChallengeRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.writon.admin.domain.dto.request.challenge;

import com.writon.admin.domain.entity.lcoal.SpecialQuestion;
import com.writon.admin.domain.dto.lcoal.SpecialQuestionDto;
import java.time.LocalDate;
import java.util.List;
import lombok.AllArgsConstructor;
Expand All @@ -15,7 +15,7 @@ public class CreateChallengeRequestDto {
private LocalDate endDate;
private List<LocalDate> processDates;
private List<String> basicQuestions;
private List<SpecialQuestion> specialQuestions;
private List<SpecialQuestionDto> specialQuestions;
private List<String> emailList;

}
4 changes: 2 additions & 2 deletions src/main/java/com/writon/admin/domain/dto/request/challenge/QuestionsRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.writon.admin.domain.dto.request.challenge;

import com.writon.admin.domain.entity.lcoal.SpecialQuestion;
import com.writon.admin.domain.dto.lcoal.SpecialQuestionDto;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
Expand All @@ -10,6 +10,6 @@
public class QuestionsRequestDto {

private List<String> basicQuestions;
private List<SpecialQuestion> specialQuestions;
private List<SpecialQuestionDto> specialQuestions;

}
3 changes: 1 addition & 2 deletions src/main/java/com/writon/admin/domain/dto/response/auth/LoginResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.writon.admin.domain.dto.response.auth;

import com.writon.admin.domain.entity.lcoal.ChallengeResponse;
import com.writon.admin.domain.entity.organization.AdminUser;
import com.writon.admin.domain.dto.lcoal.ChallengeResponse;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/writon/admin/domain/dto/response/challenge/CreateChallengeResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.writon.admin.domain.dto.response.challenge;

import com.writon.admin.domain.entity.lcoal.ChallengeResponse;
import com.writon.admin.domain.dto.lcoal.ChallengeResponse;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/writon/admin/domain/dto/response/challenge/QuestionsResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.writon.admin.domain.dto.response.challenge;

import com.writon.admin.domain.entity.lcoal.SpecialQuestion;
import com.writon.admin.domain.dto.lcoal.SpecialQuestionDto;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
Expand All @@ -10,6 +10,6 @@
public class QuestionsResponseDto {

private List<String> basicQuestions;
private List<SpecialQuestion> specialQuestions;
private List<SpecialQuestionDto> specialQuestions;

}
5 changes: 1 addition & 4 deletions src/main/java/com/writon/admin/domain/service/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

import com.writon.admin.domain.dto.request.auth.LoginRequestDto;
import com.writon.admin.domain.dto.request.auth.SignUpRequestDto;
import com.writon.admin.domain.dto.request.auth.ReissueRequestDto;
import com.writon.admin.domain.dto.response.auth.LoginResponseDto;
import com.writon.admin.domain.dto.response.auth.ReissueResponseDto;
import com.writon.admin.domain.dto.response.auth.SignUpResponseDto;
import com.writon.admin.domain.dto.wrapper.auth.LoginResponseWrapper;
import com.writon.admin.domain.entity.challenge.Challenge;
import com.writon.admin.domain.entity.lcoal.ChallengeResponse;
import com.writon.admin.domain.dto.lcoal.ChallengeResponse;
import com.writon.admin.domain.entity.organization.AdminUser;
import com.writon.admin.domain.entity.organization.Organization;
import com.writon.admin.domain.repository.challenge.ChallengeRepository;
Expand All @@ -18,7 +16,6 @@
import com.writon.admin.global.config.auth.TokenProvider;
import com.writon.admin.global.error.CustomException;
import com.writon.admin.global.error.ErrorCode;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
Expand Down
Loading