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
7 changes: 7 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ dependencies {
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-mysql'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
compileOnly 'org.projectlombok:lombok'
developmentOnly 'org.springframework.boot:spring-boot-devtools'
runtimeOnly 'com.mysql:mysql-connector-j'
Expand All @@ -48,6 +49,12 @@ dependencies {
implementation 'software.amazon.awssdk:sts'
implementation 'software.amazon.awssdk:core:2.30.20'
implementation 'software.amazon.awssdk:ec2'

// QueryDSL
implementation "com.querydsl:querydsl-jpa:5.0.0:jakarta"
annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta"
annotationProcessor "jakarta.annotation:jakarta.annotation-api:3.0.0"
annotationProcessor "jakarta.persistence:jakarta.persistence-api:3.0.0"
}

tasks.named('test') {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package es.princip.ringus.application.mentor.service;

import es.princip.ringus.domain.exception.MentorErrorCode;
import es.princip.ringus.domain.exception.SignUpErrorCode;
import es.princip.ringus.domain.member.Member;
import es.princip.ringus.domain.member.MemberRepository;
import es.princip.ringus.domain.mentor.Mentor;
import es.princip.ringus.domain.mentor.MentorRepository;
Expand All @@ -18,6 +16,7 @@
@Transactional(readOnly = true)
public class MentorService {

// private final SerializeMentorCursor serializeMentorCursor;
private final MemberRepository memberRepository;
private final MentorRepository mentorRepository;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package es.princip.ringus.domain.exception;

import es.princip.ringus.global.exception.ErrorCode;
import org.springframework.http.HttpStatus;

public enum SerialErrorCode implements ErrorCode {
CURSOR_NOT_SERIALIZABLE(HttpStatus.NOT_ACCEPTABLE, "Cursor not serializable");

SerialErrorCode(HttpStatus status, String message) {
this.status = status;
this.message = message;
}

private final HttpStatus status;
private final String message;

@Override
public HttpStatus status() {
return this.status;
}

@Override
public String message() {
return this.message;
}

@Override
public String code() {
return this.name();
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package es.princip.ringus.domain.mentor;

import es.princip.ringus.domain.member.Member;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

@Repository
public interface MentorRepository extends JpaRepository<Mentor, Long> {
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@

import jakarta.persistence.Embeddable;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.time.LocalTime;
import java.util.Set;
import java.util.stream.Collectors;

@Getter
@Embeddable
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Timezone {
Expand Down Expand Up @@ -38,9 +40,9 @@ public Timezone(
this.endTime = endTime;
}

public Set<Days> getDays() {
public Set<String> getDays() {
return Set.of(days.split(", ")).stream()
.map(Days::valueOf)
.map(String::valueOf)
.collect(Collectors.toSet());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package es.princip.ringus.presentation.common.dto;

import es.princip.ringus.domain.common.Education;

public record EducationResponse(
String schoolName,
String major
) {
public static EducationResponse of(final Education education) {
return new EducationResponse(
education.getSchoolName(),
education.getMajor()
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package es.princip.ringus.presentation.common.dto;

import es.princip.ringus.domain.mentor.vo.Introduction;

public record IntroductionResponse(
String title,
String content
) {
public static IntroductionResponse of(final Introduction introduction) {
return new IntroductionResponse(introduction.getTitle(), introduction.getContent());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package es.princip.ringus.presentation.common.dto;

import es.princip.ringus.domain.mentor.vo.Organization;

public record OrganizationResponse(
String name,
String jobCategory,
String detailedJob,
int experience
) {
public static OrganizationResponse of(final Organization organization) {
return new OrganizationResponse(
organization.getName(),
organization.getJobCategory().name(),
organization.getDetailedJob().name(),
organization.getExperience()
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package es.princip.ringus.presentation.common.dto;

import es.princip.ringus.domain.mentor.vo.Portfolio;

public record PortfolioResponse(
String url,
String description
) {
public static PortfolioResponse of(final Portfolio portfolio) {
return new PortfolioResponse(portfolio.getUrl(), portfolio.getDescription());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package es.princip.ringus.presentation.common.dto;

import es.princip.ringus.domain.mentor.vo.Timezone;

import java.time.LocalTime;
import java.util.Set;

public record TimezoneResponse(
Set<String> days,
LocalTime startTime,
LocalTime endTime
) {
public static TimezoneResponse of(final Timezone timezone) {
return new TimezoneResponse(
timezone.getDays(),
timezone.getStartTime(),
timezone.getEndTime()
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@ public record MemberResponse(
String email,
boolean isFileVerified,
boolean isProfileRegisterd,
boolean isUniversityVerified
boolean isUniversityVerified,
String imgUrl
) {
public static MemberResponse from(Member member) {
return new MemberResponse(
member.getMemberType(),
member.getEmail(),
member.isProfileRegistered(),
member.isProfileRegistered(),
member.isUniversityVerified()
member.isUniversityVerified(),
""
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

import es.princip.ringus.application.mentee.service.MenteeService;
import es.princip.ringus.global.util.ApiResponseWrapper;
import es.princip.ringus.presentation.mentee.dto.EditMenteeRequest;
import es.princip.ringus.presentation.mentee.dto.EditMenteeResponse;
import es.princip.ringus.presentation.mentee.dto.MenteeRequest;
import es.princip.ringus.presentation.mentee.dto.MenteeResponse;
import es.princip.ringus.presentation.mentee.dto.*;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
Expand All @@ -29,4 +26,9 @@ public ResponseEntity<ApiResponseWrapper<EditMenteeResponse>> update(@Valid @Req
EditMenteeResponse response = EditMenteeResponse.from(menteeService.edit(request));
return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "성공", response));
}

@Override
public ResponseEntity<ApiResponseWrapper<MyMenteeResponse>> getMyMentee(Long menteeId) {
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,15 @@


import es.princip.ringus.global.util.ApiResponseWrapper;
import es.princip.ringus.presentation.mentee.dto.EditMenteeRequest;
import es.princip.ringus.presentation.mentee.dto.EditMenteeResponse;
import es.princip.ringus.presentation.mentee.dto.MenteeRequest;
import es.princip.ringus.presentation.mentee.dto.MenteeResponse;
import es.princip.ringus.presentation.mentee.dto.*;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.*;

@Tag(name = "Mentee API", description = "멘티 관련 API")
@RequestMapping("/mentee")
Expand All @@ -37,4 +31,12 @@ public interface MenteeControllerDocs {
})
@PutMapping
ResponseEntity<ApiResponseWrapper<EditMenteeResponse>> update(@Valid @RequestBody @Parameter(description = "멘티 수정 요청") EditMenteeRequest request);

@Operation(summary = "멘티 상세 조회", description = "멘티 상세 조회를 합니다.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "멘티 상세 조회 성공"),
@ApiResponse(responseCode = "404", description = "해당 id의 멘티가 존재하지 않음")
})
@GetMapping
ResponseEntity<ApiResponseWrapper<MyMenteeResponse>> getMyMentee(Long menteeId);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package es.princip.ringus.presentation.mentee;

import es.princip.ringus.global.annotation.SessionMemberId;
import es.princip.ringus.global.util.ApiResponseWrapper;
import es.princip.ringus.presentation.mentee.dto.MyMenteeResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

@Tag(name = "My Mentee API", description = "내 멘티 API")
@RequestMapping("/mentee/me")
public interface MyMenteeControllerDocs {

@Operation(summary = "내 멘티 조회", description = "기존 멘티 정보를 수정합니다.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "나의 멘티 조회 성공"),
@ApiResponse(responseCode = "404", description = "멘티 프로필을 등록한 적이 없음")
})
@GetMapping
ResponseEntity<ApiResponseWrapper<MyMenteeResponse>> getMyMentee(@SessionMemberId Long memberId);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package es.princip.ringus.presentation.mentee.dto;

import es.princip.ringus.domain.mentee.Mentee;
import es.princip.ringus.presentation.common.dto.EducationResponse;

public record MenteeDetailResponse(
String nickname,
EducationResponse education,
String introduction
) {
public static MenteeDetailResponse of(final Mentee mentee) {
return new MenteeDetailResponse(
mentee.getNickname(),
EducationResponse.of(mentee.getEducation()),
mentee.getIntroduction()
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package es.princip.ringus.presentation.mentee.dto;

import es.princip.ringus.domain.mentee.Mentee;
import es.princip.ringus.presentation.common.dto.EducationResponse;

public record MyMenteeResponse(
String nickname,
EducationResponse education,
String introduction
) {
public static MyMenteeResponse of(final Mentee mentee) {
return new MyMenteeResponse(
mentee.getNickname(),
EducationResponse.of(mentee.getEducation()),
mentee.getIntroduction()
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
import es.princip.ringus.application.mentor.service.MentorService;
import es.princip.ringus.global.annotation.SessionMemberId;
import es.princip.ringus.global.util.ApiResponseWrapper;
import es.princip.ringus.presentation.mentor.dto.EditMentorRequest;
import es.princip.ringus.presentation.mentor.dto.EditMentorResponse;
import es.princip.ringus.presentation.mentor.dto.MentorRequest;
import es.princip.ringus.presentation.mentor.dto.MentorResponse;
import es.princip.ringus.presentation.mentor.dto.*;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
Expand All @@ -31,4 +28,9 @@ public ResponseEntity<ApiResponseWrapper<EditMentorResponse>> update(@Valid @Req
EditMentorResponse response = EditMentorResponse.from(mentorService.edit(request));
return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "성공", response));
}

@Override
public ResponseEntity<ApiResponseWrapper<MentorCardResponse>> getMyMentor() {
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

import es.princip.ringus.global.annotation.SessionMemberId;
import es.princip.ringus.global.util.ApiResponseWrapper;
import es.princip.ringus.presentation.mentor.dto.EditMentorRequest;
import es.princip.ringus.presentation.mentor.dto.EditMentorResponse;
import es.princip.ringus.presentation.mentor.dto.MentorRequest;
import es.princip.ringus.presentation.mentor.dto.MentorResponse;
import es.princip.ringus.presentation.mentor.dto.*;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
Expand Down Expand Up @@ -34,4 +31,11 @@ public interface MentorControllerDocs {
})
@PutMapping
ResponseEntity<ApiResponseWrapper<EditMentorResponse>> update(@Valid @RequestBody @Parameter(description = "멘토 수정 요청") EditMentorRequest request);

@Operation(summary = "멘토 목록 조회", description = "멘토 목록을 조회합니다.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200", description = "나의 멘토 조회 성공")
})
@GetMapping
ResponseEntity<ApiResponseWrapper<MentorCardResponse>> getMyMentor();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package es.princip.ringus.presentation.mentor;

public record MentorSearchFilter(
boolean bookmarked,
boolean commissioned
) {
}
Loading