♻️ [REFACTOR] Null Check 통합 및 레포지토리 추상화 제거 (#17)

* ♻️ refactor: Null check 변경 및 추가

* ♻️ refactor: Repository 추상화 제거

src/main/java/com/sponus/sponusbe/auth/user/CustomUserDetailsService.java

@@ -6,7 +6,9 @@
 import org.springframework.stereotype.Service;
 
 import com.sponus.sponusbe.domain.organization.entity.Organization;
+import com.sponus.sponusbe.domain.organization.exception.OrganizationException;
 import com.sponus.sponusbe.domain.organization.repository.OrganizationRepository;
+import com.sponus.sponusbe.global.common.code.OrganizationErrorCode;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -20,7 +22,8 @@ public class CustomUserDetailsService implements UserDetailsService {
 
 	@Override
 	public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException {
-		Organization findOrganization = organizationRepository.findOrganizationByEmail(email);
+		Organization findOrganization = organizationRepository.findOrganizationByEmail(email)
+			.orElseThrow(() -> new OrganizationException(OrganizationErrorCode.ORGANIZATION_NOT_FOUND));
 
 		log.info("[*] Organization found : " + findOrganization.getEmail());
 

src/main/java/com/sponus/sponusbe/domain/announcement/entity/Announcement.java

@@ -38,25 +38,25 @@ public class Announcement extends BaseEntity {
 	@Column(name = "announcement_id")
 	private Long id;
 
-	@Column(name = "announcement_title")
+	@Column(name = "announcement_title", nullable = false)
 	private String title;
 
-	@Column(name = "announcement_type")
+	@Column(name = "announcement_type", nullable = false)
 	@Enumerated(EnumType.STRING)
 	private AnnouncementType type;
 
-	@Column(name = "announcement_category")
+	@Column(name = "announcement_category", nullable = false)
 	@Enumerated(EnumType.STRING)
 	private AnnouncementCategory category;
 
-	@Column(name = "announcement_content")
+	@Column(name = "announcement_content", nullable = false)
 	private String content;
 
-	@Column(name = "announcement_status")
+	@Column(name = "announcement_status", nullable = false)
 	@Enumerated(EnumType.STRING)
 	private AnnouncementStatus status;
 
-	@Column(name = "view_count")
+	@Column(name = "view_count", nullable = false)
 	private long viewCount;
 
 	@ManyToOne(fetch = FetchType.LAZY)

src/main/java/com/sponus/sponusbe/domain/announcement/entity/AnnouncementAttachment.java

@@ -30,13 +30,13 @@ public class AnnouncementAttachment {
 	@Column(name = "attachment_id")
 	private Long id;
 
-	@Column(name = "file_name")
+	@Column(name = "file_name", nullable = false)
 	private String name;
 
-	@Column(name = "file_url")
+	@Column(name = "file_url", nullable = false)
 	private String url;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = FetchType.LAZY, optional = false)
 	@JoinColumn(name = "announcement_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
 	private Announcement announcement;
 }

src/main/java/com/sponus/sponusbe/domain/announcement/entity/AnnouncementImage.java

@@ -29,13 +29,13 @@ public class AnnouncementImage {
 	@Column(name = "image_id")
 	private Long id;
 
-	@Column(name = "image_name")
+	@Column(name = "image_name", nullable = false)
 	private String name;
 
-	@Column(name = "image_url")
+	@Column(name = "image_url", nullable = false)
 	private String url;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = FetchType.LAZY, optional = false)
 	@JoinColumn(name = "announcement_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
 	private Announcement announcement;
 }

src/main/java/com/sponus/sponusbe/domain/announcement/entity/enums/AnnouncementStatus.java

@@ -1,5 +1,5 @@
 package com.sponus.sponusbe.domain.announcement.entity.enums;
 
 public enum AnnouncementStatus {
-	POSTED, IN_PROGRESS, COMPLETED, CANCELLED
+	POSTED, IN_PROGRESS, PAUSED, COMPLETED, CANCELLED
 }

src/main/java/com/sponus/sponusbe/domain/organization/dto/OrganizationJoinRequest.java

@@ -5,51 +5,51 @@
 import com.sponus.sponusbe.domain.organization.entity.enums.OrganizationType;
 import com.sponus.sponusbe.domain.organization.entity.enums.SuborganizationType;
 
-import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Pattern;
 import jakarta.validation.constraints.Size;
 
 public record OrganizationJoinRequest(
-	@NotEmpty(message = "[ERROR] 이름 입력은 필수 입니다.")
+	@NotBlank(message = "[ERROR] 이름 입력은 필수 입니다.")
 	String name,
 
-	@NotEmpty(message = "[ERROR] 이메일 입력은 필수입니다.")
+	@NotBlank(message = "[ERROR] 이메일 입력은 필수입니다.")
 	@Pattern(regexp = "^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+.[A-Za-z]{2,6}$", message = "[ERROR] 이메일 형식에 맞지 않습니다.")
 	String email,
 
-	@NotEmpty(message = "[ERROR] 비밀번호 입력은 필수 입니다.")
+	@NotBlank(message = "[ERROR] 비밀번호 입력은 필수 입니다.")
 	@Size(min = 10, message = "[ERROR] 비밀번호는 최소 10자리 이이어야 합니다.")
 	String password,
 
-	@NotEmpty(message = "[ERROR] 위치 입력은 필수 입니다.")
+	@NotBlank(message = "[ERROR] 위치 입력은 필수 입니다.")
 	String location,
 
-	@NotEmpty(message = "[ERROR] 단체 유형 입력은 필수입니다.")
+	@NotBlank(message = "[ERROR] 단체 유형 입력은 필수입니다.")
 	OrganizationType organizationType,
 
-	@NotEmpty(message = "[ERROR] 단체 서브 유형 입력은 필수입니다.")
+	@NotBlank(message = "[ERROR] 단체 서브 유형 입력은 필수입니다.")
 	SuborganizationType suborganizationType,
 
-	@NotEmpty(message = "[ERROR] 담당자 이름 입력은 필수입니다.")
+	@NotBlank(message = "[ERROR] 담당자 이름 입력은 필수입니다.")
 	String managerName,
 
-	@NotEmpty(message = "[ERROR] 담당자 직책 입력은 필수입니다.")
+	@NotBlank(message = "[ERROR] 담당자 직책 입력은 필수입니다.")
 	String managerPosition,
 
-	@NotEmpty(message = "[ERROR] 담당자 이메일 입력은 필수입니다.")
+	@NotBlank(message = "[ERROR] 담당자 이메일 입력은 필수입니다.")
 	@Pattern(regexp = "^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+.[A-Za-z]{2,6}$", message = "[ERROR] 이메일 형식에 맞지 않습니다.")
 	String managerEmail,
 
-	@NotEmpty(message = "[ERROR] 담당자 전화번호 입력은 필수입니다.")
+	@NotBlank(message = "[ERROR] 담당자 전화번호 입력은 필수입니다.")
 	String managerPhone,
 
-	@NotEmpty(message = "[ERROR] 담당자 연락 가능 요일 입력은 필수입니다.")
+	@NotBlank(message = "[ERROR] 담당자 연락 가능 요일 입력은 필수입니다.")
 	String managerAvailableDay,
 
-	@NotEmpty(message = "[ERROR] 담당자 연락 가능 시간 입력은 필수입니다.")
+	@NotBlank(message = "[ERROR] 담당자 연락 가능 시간 입력은 필수입니다.")
 	String managerAvailableHour,
 
-	@NotEmpty(message = "[ERROR] 담당자 연락 선호 방법 입력은 필수입니다.")
+	@NotBlank(message = "[ERROR] 담당자 연락 선호 방법 입력은 필수입니다.")
 	String managerContactPreference
 ) {
 

src/main/java/com/sponus/sponusbe/domain/organization/entity/Organization.java

@@ -3,10 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hibernate.annotations.DynamicInsert;
-import org.hibernate.annotations.DynamicUpdate;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.sponus.sponusbe.domain.organization.entity.enums.OrganizationStatus;
 import com.sponus.sponusbe.domain.organization.entity.enums.OrganizationType;
 import com.sponus.sponusbe.domain.organization.entity.enums.SuborganizationType;
@@ -26,14 +22,11 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import lombok.NonNull;
 
 @Builder
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
 @Getter
-@DynamicUpdate
-@DynamicInsert
 @Entity
 @Table(name = "organization")
 public class Organization extends BaseEntity {
@@ -43,84 +36,55 @@ public class Organization extends BaseEntity {
 	@Column(name = "organization_id")
 	private Long id;
 
-	@Column(name = "organization_name")
-	@JsonProperty("name")
-	@NonNull
+	@Column(name = "organization_name", nullable = false)
 	private String name;
 
-	@Column(name = "organization_email", unique = true)
-	@JsonProperty("email")
-	@NonNull
+	@Column(name = "organization_email", nullable = false, unique = true)
 	private String email;
 
-	@Column(name = "organization_password")
-	@JsonProperty("password")
-	@NonNull
+	@Column(name = "organization_password", nullable = false)
 	private String password;
 
-	@Column(name = "organization_location")
-	@JsonProperty("location")
-	@NonNull
+	@Column(name = "organization_location", nullable = false)
 	private String location;
 
 	@Column(name = "organization_description")
-	@JsonProperty("description")
 	private String description;
 
 	@Column(name = "organization_image_url")
-	@JsonProperty("image_url")
 	private String imageUrl;
 
-	@Column(name = "organization_type")
+	@Column(name = "organization_type", nullable = false)
 	@Enumerated(EnumType.STRING)
-	@JsonProperty("type")
-	@NonNull
 	private OrganizationType organizationType;
 
-	@Column(name = "suborganization_type")
+	@Column(name = "suborganization_type", nullable = false)
 	@Enumerated(EnumType.STRING)
-	@JsonProperty("subtype")
-	@NonNull
 	private SuborganizationType suborganizationType;
 
-	@Column(name = "manager_name")
-	@JsonProperty("manager_name")
-	@NonNull
+	@Column(name = "manager_name", nullable = false)
 	private String managerName;
 
-	@Column(name = "manager_position")
-	@JsonProperty("manager_position")
-	@NonNull
+	@Column(name = "manager_position", nullable = false)
 	private String managerPosition;
 
-	@Column(name = "manager_email")
-	@JsonProperty("manager_email")
-	@NonNull
+	@Column(name = "manager_email", nullable = false)
 	private String managerEmail;
 
-	@Column(name = "manager_phone")
-	@JsonProperty("manager_phone")
-	@NonNull
+	@Column(name = "manager_phone", nullable = false)
 	private String managerPhone;
 
-	@Column(name = "manager_available_day")
-	@JsonProperty("manager_available_day")
-	@NonNull
+	@Column(name = "manager_available_day", nullable = false)
 	private String managerAvailableDay;
 
-	@Column(name = "manager_available_hour")
-	@JsonProperty("manager_available_hour")
-	@NonNull
+	@Column(name = "manager_available_hour", nullable = false)
 	private String managerAvailableHour;
 
-	@Column(name = "manager_contact_preference")
-	@JsonProperty("manager_contact_preference")
-	@NonNull
+	@Column(name = "manager_contact_preference", nullable = false)
 	private String managerContactPreference;
 
-	@Column(name = "organization_status")
+	@Column(name = "organization_status", nullable = false)
 	@Enumerated(EnumType.STRING)
-	@NonNull
 	private OrganizationStatus organizationStatus;
 
 	@Builder.Default

src/main/java/com/sponus/sponusbe/domain/organization/entity/OrganizationLink.java

@@ -30,13 +30,13 @@ public class OrganizationLink {
 	@Column(name = "link_id")
 	private Long id;
 
-	@Column(name = "link_name")
+	@Column(name = "link_name", nullable = false)
 	private String name;
 
-	@Column(name = "link_url")
+	@Column(name = "link_url", nullable = false)
 	private String url;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = FetchType.LAZY, optional = false)
 	@JoinColumn(name = "organization_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
 	private Organization organization;
 }

src/main/java/com/sponus/sponusbe/domain/organization/entity/OrganizationTag.java

@@ -30,11 +30,11 @@ public class OrganizationTag {
 	@Column(name = "id")
 	private Long id;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = FetchType.LAZY, optional = false)
 	@JoinColumn(name = "organization_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
 	private Organization organization;
 
-	@ManyToOne(fetch = FetchType.LAZY)
+	@ManyToOne(fetch = FetchType.LAZY, optional = false)
 	@JoinColumn(name = "tag_id", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
 	private Tag tag;
 }

src/main/java/com/sponus/sponusbe/domain/organization/entity/Tag.java

@@ -25,6 +25,6 @@ public class Tag {
 	@Column(name = "tag_id")
 	private Long id;
 
-	@Column(name = "tag_name")
+	@Column(name = "tag_name", nullable = false)
 	private String name;
 }

src/main/java/com/sponus/sponusbe/domain/organization/repository/OrganizationRepository.java

@@ -1,10 +1,12 @@
 package com.sponus.sponusbe.domain.organization.repository;
 
-import com.sponus.sponusbe.domain.organization.entity.Organization;
+import java.util.Optional;
+
+import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface OrganizationRepository {
+import com.sponus.sponusbe.domain.organization.entity.Organization;
 
-	Organization save(Organization organization);
+public interface OrganizationRepository extends JpaRepository<Organization, Long> {
 
-	Organization findOrganizationByEmail(String email);
+	Optional<Organization> findOrganizationByEmail(String email);
 }