Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
e8d1470
refactor: sign-in 관련 패키지 이동 및 정리
m-a-king Jan 13, 2025
0c9b341
feat(cookie): 쿠키 관련 로직 삭제
m-a-king Jan 13, 2025
61fa54c
feat(sign): 불필요한 클래스 삭제, 로직 개선, 컨트롤러 분리
m-a-king Jan 13, 2025
4f14437
feat(sign): 불필요한 유저 정보 반환 엔드포인트 삭제
m-a-king Jan 13, 2025
53a1419
feat(ApiResponse): 가독성 개선, 메서드 추가
m-a-king Jan 13, 2025
23fd618
refactor: DTO 명명 구체화
m-a-king Jan 13, 2025
eaf0190
feat(sign-out): 로그아웃 패키지 이동, 불필요한 로직 삭제
m-a-king Jan 13, 2025
189732b
feat: 불필요한 로직 삭제
m-a-king Jan 13, 2025
b2c2030
feat(token): 컨트롤러 로직 개선, 명명 구체화
m-a-king Jan 13, 2025
4d4b3f5
refactor(token): 로직 개선, 명명 수정, 패키지 이동
m-a-king Jan 13, 2025
846edfb
feat(token): 만료된 액세스 토큰 관리 삭제
m-a-king Jan 13, 2025
d41de3e
feat(user): password 를 accountPassword로 수정
m-a-king Jan 13, 2025
2043cd0
refactor: 코드 일관성을 위한 리팩토링
m-a-king Jan 14, 2025
8b60901
feat(volunteer): 기존 엔티티들 old 처리
m-a-king Jan 14, 2025
9229f08
feat(center): 센터의 id, pw 삭제
m-a-king Jan 14, 2025
eab2166
feat(user): 유저에서 뻗어나오는 새로운 봉사자, 기관 추가
m-a-king Jan 14, 2025
5a8f3ca
feat(center): 불필요한 sign 로직 삭제
m-a-king Jan 14, 2025
5391a02
rollback: 삭제가 너무 힘들다... 미뤄야할 것 같음
m-a-king Jan 14, 2025
e827dfb
feat(user): 봉사자/기관 엔티티, 리포지토리 추가
m-a-king Jan 14, 2025
d1e50f1
rollback
m-a-king Jan 14, 2025
fd86a1f
feat(user): volunteer, center 회원가입 기본 정적 팩토리 메서드 추가 및 관련 ENUM 개선
m-a-king Jan 15, 2025
6207575
feat(user): volunteer, center 회원가입 서비스 로직 추가
m-a-king Jan 15, 2025
e3d4cd8
rollback
m-a-king Jan 15, 2025
bab7483
refactor: 클래스 명 파스칼 케이스로 수정
m-a-king Jan 15, 2025
698d844
feat(register): 회원 가입 로직 (유저가 생성된 후, 봉사자나 기관이 생성)
m-a-king Jan 15, 2025
4cdbd25
feat(user): accountId 중복 확인 기능 추가
m-a-king Jan 15, 2025
769ba1b
fix: bean name conflict 해결
m-a-king Jan 15, 2025
e221554
fix: rollback 문제 해결, 테스트 문제 해결
m-a-king Jan 15, 2025
4cf63ce
feat: 기관의 베이스 엔티티 상속 추가
m-a-king Jan 16, 2025
a3805a1
feat(center): 기관 아이디, 유저 아이디 기준 조회 기능 추가
m-a-king Jan 16, 2025
7d552c7
feat(volunteer): 봉사자 아이디, 유저 아이디 기준 조회 기능 추가
m-a-king Jan 16, 2025
e6791d8
test(center): 기관 조회, 저장 테스트 추가
m-a-king Jan 16, 2025
6ed46c6
test(volunteer): 봉사자 조회, 저장 테스트 추가
m-a-king Jan 16, 2025
b994d24
refactor: suffix -> prefix
m-a-king Jan 16, 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
52 changes: 52 additions & 0 deletions src/main/java/com/somemore/center/domain/NEWCenter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package com.somemore.center.domain;

import com.somemore.global.common.entity.BaseEntity;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.util.UUID;

@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Entity
@Table(name = "new_center") // TODO prefix 삭제
public class NEWCenter extends BaseEntity {

public static final String DEFAULT_NAME = "기관";
@Id
@GeneratedValue(strategy = GenerationType.UUID)
@Column(name = "id", nullable = false, columnDefinition = "BINARY(16)")
private UUID id;

@Column(name = "user_id", nullable = false, columnDefinition = "BINARY(16)")
private UUID userId;

@Column(name = "name", nullable = false)
private String name;

@Column(name = "homepage_url", nullable = false)
private String homepageUrl;

@Builder
private NEWCenter(UUID userId, String name, String homepageUrl) {
this.userId = userId;
this.name = name;
this.homepageUrl = homepageUrl;
}

public static NEWCenter createDefault(UUID userId) {
return NEWCenter.builder()
.userId(userId)
.name(DEFAULT_NAME + userId.toString().substring(0, 8))
.homepageUrl("")
.build();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.somemore.center.repository;

import com.somemore.center.domain.NEWCenter;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import java.util.UUID;

@Repository("newCenterJpaRepository")
public interface NEWCenterJpaRepository extends JpaRepository<NEWCenter, UUID> {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.somemore.center.repository;

import com.somemore.center.domain.NEWCenter;

import java.util.Optional;
import java.util.UUID;

public interface NEWCenterRepository {

NEWCenter save(NEWCenter center);

Optional<NEWCenter> findById(UUID id);

Optional<NEWCenter> findByUserId(UUID userId);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package com.somemore.center.repository;

import com.querydsl.jpa.impl.JPAQueryFactory;
import com.somemore.center.domain.NEWCenter;
import com.somemore.center.domain.QNEWCenter;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Repository;

import java.util.Optional;
import java.util.UUID;

@Repository("newCenterRepository")
@RequiredArgsConstructor
public class NEWCenterRepositoryImpl implements NEWCenterRepository {

@Qualifier("newCenterJpaRepository")
private final NEWCenterJpaRepository NEWCenterJpaRepository;
private final JPAQueryFactory queryFactory;

private static final QNEWCenter center = QNEWCenter.nEWCenter;

@Override
public NEWCenter save(NEWCenter center) {
return NEWCenterJpaRepository.save(center);
}

@Override
public Optional<NEWCenter> findById(UUID id) {
return Optional.ofNullable(
queryFactory.selectFrom(center)
.where(
center.id.eq(id),
center.deleted.eq(false))
.fetchOne()
);
}

@Override
public Optional<NEWCenter> findByUserId(UUID userId) {
return Optional.ofNullable(
queryFactory.selectFrom(center)
.where(
center.userId.eq(userId),
center.deleted.eq(false))
.fetchOne()

);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.somemore.center.service;

import com.somemore.center.domain.NEWCenter;
import com.somemore.center.repository.NEWCenterRepository;
import com.somemore.center.usecase.NEWRegisterCenterUseCase;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.UUID;

@Service
@RequiredArgsConstructor
@Transactional
public class NEWRegisterCenterService implements NEWRegisterCenterUseCase {

@Qualifier("newCenterRepository")
private final NEWCenterRepository NEWCenterRepository;

@Override
public NEWCenter register(UUID userId) {
NEWCenter center = NEWCenter.createDefault(userId);
return NEWCenterRepository.save(center);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.somemore.center.usecase;

import com.somemore.center.domain.NEWCenter;

import java.util.UUID;

public interface NEWRegisterCenterUseCase {

NEWCenter register(UUID userId);
}
16 changes: 2 additions & 14 deletions src/main/java/com/somemore/domains/center/domain/Center.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,34 +33,22 @@ public class Center extends BaseEntity {
@Column(name = "homepage_link", nullable = false)
private String homepageLink;

@Column(name = "account_id", nullable = false)
private String accountId;

@Column(name = "account_pw", nullable = false)
private String accountPw;


@Builder
private Center(String name, String contactNumber, String imgUrl, String introduce, String homepageLink, String accountId, String accountPw) {

private Center(String name, String contactNumber, String imgUrl, String introduce, String homepageLink) {
this.name = name;
this.contactNumber = contactNumber;
this.imgUrl = imgUrl;
this.introduce = introduce;
this.homepageLink = homepageLink;
this.accountId = accountId;
this.accountPw = accountPw;
}

public static Center create(String name, String contactNumber, String imgUrl, String introduce, String homepageLink, String accountId, String accountPw) {
public static Center create(String name, String contactNumber, String imgUrl, String introduce, String homepageLink) {
return Center.builder()
.name(name)
.contactNumber(contactNumber)
.imgUrl(imgUrl)
.introduce(introduce)
.homepageLink(homepageLink)
.accountId(accountId)
.accountPw(accountPw)
.build();
}

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

import com.somemore.domains.center.domain.Center;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;

import java.util.Optional;
import java.util.UUID;

@Repository("centerJpaRepository")
public interface CenterJpaRepository extends JpaRepository<Center, Long> {

boolean existsById(UUID id);

Optional<Center> findCenterById(UUID id);

Optional<Center> findByName(String name);

boolean existsByIdAndDeletedIsFalse(UUID id);
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import java.util.Optional;
import java.util.UUID;

@Repository
public interface CenterRepository {
Center save(Center center);
boolean existsById(UUID id);
Expand All @@ -17,8 +16,5 @@ default boolean doesNotExistById(UUID id) {
}
Optional<Center> findCenterById(UUID id);
List<CenterOverviewInfo> findCenterOverviewsByIds(List<UUID> ids);
UUID findIdByAccountId(String accountId);
String findPasswordByAccountId(String accountId);
void deleteAllInBatch();

}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import java.util.UUID;

@RequiredArgsConstructor
@Repository
@Repository("centerRepository")
public class CenterRepositoryImpl implements CenterRepository {

private final JPAQueryFactory queryFactory;
Expand Down Expand Up @@ -61,28 +61,6 @@ public List<CenterOverviewInfo> findCenterOverviewsByIds(List<UUID> ids) {
.fetch();
}

@Override
public UUID findIdByAccountId(String accountId) {

return queryFactory
.select(center.id)
.from(center)
.where(center.accountId.eq(accountId)
.and(isNotDeleted()))
.fetchOne();
}

@Override
public String findPasswordByAccountId(String accountId) {

return queryFactory
.select(center.accountPw)
.from(center)
.where(center.accountId.eq(accountId)
.and(isNotDeleted()))
.fetchOne();
}

@Override
public void deleteAllInBatch() {
centerJpaRepository.deleteAllInBatch();
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ public enum Gender {
this.code = code;
}

public static Gender getDefault() {
return UNDEFINED;
}

public static Gender from(String code) {
for (Gender gender : Gender.values()) {
if (gender.code.equalsIgnoreCase(code)) {
Expand Down
Loading
Loading