Skip to content
Merged
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.admin.dto;

import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import com.example.solidconnection.score.domain.GpaScore;

public record GpaScoreResponse(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.admin.dto;

import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;

import java.time.ZonedDateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.admin.dto;

import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import com.example.solidconnection.application.dto.validation.RejectedReasonRequired;
import jakarta.validation.constraints.NotNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.admin.dto;

import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import com.example.solidconnection.score.domain.LanguageTestScore;
import com.example.solidconnection.university.domain.LanguageTestType;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.admin.dto;

import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;

import java.time.ZonedDateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.admin.dto;

import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import com.example.solidconnection.application.dto.validation.RejectedReasonRequired;
import com.example.solidconnection.university.domain.LanguageTestType;
import jakarta.validation.constraints.NotNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.admin.dto;

import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;

import java.time.LocalDate;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.admin.dto;

import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;

public interface ScoreUpdateRequest {
VerifyStatus verifyStatus();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.example.solidconnection.admin.dto.GpaScoreUpdateRequest;
import com.example.solidconnection.admin.dto.ScoreSearchCondition;
import com.example.solidconnection.application.domain.Gpa;
import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import com.example.solidconnection.common.exception.CustomException;
import com.example.solidconnection.score.domain.GpaScore;
import com.example.solidconnection.score.repository.GpaScoreRepository;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.example.solidconnection.admin.dto.LanguageTestScoreUpdateRequest;
import com.example.solidconnection.admin.dto.ScoreSearchCondition;
import com.example.solidconnection.application.domain.LanguageTest;
import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import com.example.solidconnection.common.exception.CustomException;
import com.example.solidconnection.score.domain.LanguageTestScore;
import com.example.solidconnection.score.repository.LanguageTestScoreRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.example.solidconnection.application.domain;

import com.example.solidconnection.common.VerifyStatus;
import com.example.solidconnection.siteuser.domain.SiteUser;
import jakarta.persistence.Column;
import jakarta.persistence.Embedded;
Expand All @@ -19,7 +20,7 @@
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;

import static com.example.solidconnection.application.domain.VerifyStatus.PENDING;
import static com.example.solidconnection.common.VerifyStatus.PENDING;

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.solidconnection.application.dto.validation;

import com.example.solidconnection.admin.dto.ScoreUpdateRequest;
import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import io.micrometer.common.util.StringUtils;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.solidconnection.application.repository;

import com.example.solidconnection.application.domain.Application;
import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import com.example.solidconnection.common.exception.CustomException;
import com.example.solidconnection.siteuser.domain.SiteUser;
import org.springframework.data.jpa.repository.JpaRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.solidconnection.application.service;

import com.example.solidconnection.application.domain.Application;
import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import com.example.solidconnection.application.dto.ApplicationsResponse;
import com.example.solidconnection.application.dto.UniversityApplicantsResponse;
import com.example.solidconnection.application.repository.ApplicationRepository;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.solidconnection.application.service;

import com.example.solidconnection.application.domain.Application;
import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import com.example.solidconnection.application.dto.ApplicationSubmissionResponse;
import com.example.solidconnection.application.dto.ApplyRequest;
import com.example.solidconnection.application.dto.UniversityChoiceRequest;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.example.solidconnection.common;

public enum VerifyStatus {

PENDING,
REJECTED,
APPROVED,
;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package com.example.solidconnection.mentor.domain;

import jakarta.persistence.Column;
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.ManyToOne;
import jakarta.persistence.Table;
import jakarta.persistence.UniqueConstraint;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Entity
@Getter
@AllArgsConstructor
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Table(uniqueConstraints = {
@UniqueConstraint(
name = "uk_channel_mentor_id_sequence",
columnNames = {"mentor_id", "sequence"}
)
})
public class Channel {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column
private int sequence;

@Enumerated(EnumType.STRING)
@Column(nullable = false)
private ChannelType type;

@Column(nullable = false, length = 500)
private String url;

@ManyToOne(fetch = FetchType.LAZY)
private Mentor mentor;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.example.solidconnection.mentor.domain;

public enum ChannelType {

BLOG,
INSTAGRAM,
YOUTUBE,
BRUNCH,
;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package com.example.solidconnection.mentor.domain;

import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.OneToMany;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.util.ArrayList;
import java.util.List;

@Entity
@Getter
@AllArgsConstructor
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Mentor {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column
private int menteeCount = 0;

@Column
private boolean hasBadge = false;

@Column(length = 1000)
private String introduction;

@Column(length = 1000)
private String passTip;

@Column
private long siteUserId;

@Column
private long universityId;

@OneToMany(mappedBy = "mentor", cascade = CascadeType.ALL, orphanRemoval = true)
private List<Channel> channels = new ArrayList<>();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package com.example.solidconnection.mentor.domain;

import com.example.solidconnection.common.VerifyStatus;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.PrePersist;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.DynamicInsert;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import java.time.ZonedDateTime;

import static java.time.ZoneOffset.UTC;
import static java.time.temporal.ChronoUnit.MICROS;

@Entity
@Getter
@EntityListeners(AuditingEntityListener.class)
@DynamicInsert
@AllArgsConstructor
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class Mentoring {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column(nullable = false)
private ZonedDateTime createdAt;

@Column
private ZonedDateTime confirmedAt;

@Column
private ZonedDateTime checkedAt;

@Column(nullable = false)
@Enumerated(EnumType.STRING)
private VerifyStatus verifyStatus = VerifyStatus.PENDING;

@Column(length = 500)
private String rejectedReason;

@Column
private long mentorId;

@Column
private long menteeId;

@PrePersist
public void onPrePersist() {
this.createdAt = ZonedDateTime.now(UTC).truncatedTo(MICROS); // 나노초 6자리 까지만 저장
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.solidconnection.score.domain;

import com.example.solidconnection.application.domain.Gpa;
import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import com.example.solidconnection.common.BaseEntity;
import com.example.solidconnection.siteuser.domain.SiteUser;
import jakarta.persistence.Column;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.solidconnection.score.domain;

import com.example.solidconnection.application.domain.LanguageTest;
import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import com.example.solidconnection.common.BaseEntity;
import com.example.solidconnection.siteuser.domain.SiteUser;
import jakarta.persistence.Column;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.score.dto;

import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import com.example.solidconnection.score.domain.GpaScore;

public record GpaScoreStatusResponse(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.solidconnection.score.dto;

import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import com.example.solidconnection.score.domain.LanguageTestScore;

public record LanguageTestScoreStatusResponse(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.example.solidconnection.admin.dto.GpaScoreStatusResponse;
import com.example.solidconnection.admin.dto.ScoreSearchCondition;
import com.example.solidconnection.admin.dto.SiteUserResponse;
import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import com.querydsl.core.types.ConstructorExpression;
import com.querydsl.core.types.Projections;
import com.querydsl.core.types.dsl.BooleanExpression;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.example.solidconnection.admin.dto.LanguageTestScoreStatusResponse;
import com.example.solidconnection.admin.dto.ScoreSearchCondition;
import com.example.solidconnection.admin.dto.SiteUserResponse;
import com.example.solidconnection.application.domain.VerifyStatus;
import com.example.solidconnection.common.VerifyStatus;
import com.querydsl.core.types.ConstructorExpression;
import com.querydsl.core.types.Projections;
import com.querydsl.core.types.dsl.BooleanExpression;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import lombok.NoArgsConstructor;

@Getter
@AllArgsConstructor(access = AccessLevel.PUBLIC)
@AllArgsConstructor
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Entity
public class LanguageRequirement {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

@Getter
@EqualsAndHashCode(of = "id")
@AllArgsConstructor(access = AccessLevel.PUBLIC)
@AllArgsConstructor
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Entity
@Table(name = "university_info_for_apply")
Expand Down
Loading
Loading