Merge pull request #349 from Team-Sopetit/develop

deploy: 실서버 배포

src/main/java/com/soptie/server/batch/BatchProperties.java

@@ -0,0 +1,19 @@
+package com.soptie.server.batch;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "batch")
+public record BatchProperties(
+	Cron cron
+) {
+
+	public record Cron(
+		Init init
+	) {
+
+		public record Init(
+			String routine
+		) {
+		}
+	}
+}

src/main/java/com/soptie/server/batch/MemberRoutineScheduler.java

@@ -14,7 +14,7 @@
 public class MemberRoutineScheduler {
 	private final MemberRoutineService memberRoutineService;
 
-	@Scheduled(cron = "${softie.cron.init.routine}")
+	@Scheduled(cron = "${batch.cron.init.routine}")
 	public void initMemberDailyRoutines() {
 		memberRoutineService.initAchievement();
 	}

src/main/java/com/soptie/server/persistence/config/JpaAuditingConfig.java → src/main/java/com/soptie/server/config/JpaAuditingConfig.java

@@ -1,4 +1,4 @@
-package com.soptie.server.persistence.config;
+package com.soptie.server.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;

src/main/java/com/soptie/server/persistence/config/JpaQueryFactoryConfig.java → src/main/java/com/soptie/server/config/JpaQueryFactoryConfig.java

@@ -1,4 +1,4 @@
-package com.soptie.server.persistence.config;
+package com.soptie.server.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/soptie/server/config/PropertyConfig.java

@@ -0,0 +1,11 @@
+package com.soptie.server.config;
+
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import com.soptie.server.batch.BatchProperties;
+
+@Configuration
+@EnableConfigurationProperties({BatchProperties.class})
+public class PropertyConfig {
+}

src/main/java/com/soptie/server/api/config/SecurityConfig.java → src/main/java/com/soptie/server/config/SecurityConfig.java

@@ -1,4 +1,4 @@
-package com.soptie.server.api.config;
+package com.soptie.server.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/soptie/server/api/config/SwaggerConfig.java → src/main/java/com/soptie/server/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.soptie.server.api.config;
+package com.soptie.server.config;
 
 import static io.swagger.v3.oas.models.security.SecurityScheme.Type.*;
 

src/main/java/com/soptie/server/persistence/config/TimezoneConfig.java → src/main/java/com/soptie/server/config/TimezoneConfig.java

@@ -1,4 +1,4 @@
-package com.soptie.server.persistence.config;
+package com.soptie.server.config;
 
 import java.util.TimeZone;
 

src/main/java/com/soptie/server/domain/member/Member.java

@@ -1,16 +1,24 @@
 package com.soptie.server.domain.member;
 
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 
 @Builder
 @Getter
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
 public class Member {
 	private Long id;
 	private Social socialInfo;
 	private String refreshToken;
 	private MemberCotton cottonInfo;
 
+	public Member(SocialType socialType, String socialId) {
+		this.socialInfo = new Social(socialType, socialId);
+		this.cottonInfo = new MemberCotton(0, 0);
+	}
+
 	public void resetRefreshToken() {
 		this.refreshToken = null;
 	}

src/main/java/com/soptie/server/domain/member/Social.java

@@ -2,8 +2,10 @@
 
 import jakarta.validation.constraints.NotNull;
 import lombok.Builder;
+import lombok.Getter;
 
 @Builder
+@Getter
 public class Social {
 	@NotNull
 	protected SocialType socialType;

src/main/java/com/soptie/server/domain/memberroutine/MemberRoutine.java

@@ -1,10 +1,16 @@
 package com.soptie.server.domain.memberroutine;
 
+import com.soptie.server.domain.member.Member;
+import com.soptie.server.domain.routine.Routine;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 
 @Builder
 @Getter
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
 public class MemberRoutine {
 	private Long id;
 	private boolean isAchieved;
@@ -13,14 +19,17 @@ public class MemberRoutine {
 	private long memberId;
 	private long routineId;
 
+	public MemberRoutine(Member member, Routine routine) {
+		this.isAchieved = false;
+		this.isAchievedToday = false;
+		this.achievementCount = 0;
+		this.memberId = member.getId();
+		this.routineId = routine.getId();
+	}
+
 	public void achieve() {
 		this.isAchievedToday = true;
 		this.achievementCount += !this.isAchieved ? 1 : -1;
 		this.isAchieved = !this.isAchieved;
 	}
-
-	public void initAchievement() {
-		this.isAchievedToday = false;
-		this.isAchieved = false;
-	}
 }

src/main/java/com/soptie/server/domain/memberroutine/MemberRoutineService.java

@@ -91,10 +91,7 @@ public AchieveMemberRoutineResponse achieveMemberRoutine(long memberId, long mem
 
 	@Transactional
 	public void initAchievement() {
-		val memberRoutines = memberRoutineAdapter.findAchieved();
-		for (val memberRoutine : memberRoutines) {
-			memberRoutine.initAchievement();
-		}
+		memberRoutineAdapter.initAllAchievement();
 	}
 
 	private Map<Theme, Map<Routine, MemberRoutine>> toRoutinesByTheme(

src/main/java/com/soptie/server/domain/routine/Routine.java

@@ -1,14 +1,22 @@
 package com.soptie.server.domain.routine;
 
 import jakarta.validation.constraints.NotNull;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 
 @Builder
 @Getter
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
 public class Routine {
 	private Long id;
 	@NotNull
 	private String content;
 	private long themeId;
+
+	public Routine(String content, long themeId) {
+		this.content = content;
+		this.themeId = themeId;
+	}
 }

src/main/java/com/soptie/server/persistence/adapter/MemberRoutineAdapter.java

@@ -1,6 +1,5 @@
 package com.soptie.server.persistence.adapter;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import com.soptie.server.common.exception.ExceptionCode;
@@ -10,7 +9,7 @@
 import com.soptie.server.domain.memberroutine.MemberRoutine;
 import com.soptie.server.domain.routine.Routine;
 import com.soptie.server.persistence.entity.MemberRoutineEntity;
-import com.soptie.server.persistence.repository.MemberRoutineRepository;
+import com.soptie.server.persistence.repository.routine.MemberRoutineRepository;
 
 import lombok.RequiredArgsConstructor;
 import lombok.val;
@@ -60,14 +59,8 @@ public void update(MemberRoutine memberRoutine) {
 		memberRoutineEntity.update(memberRoutine);
 	}
 
-	public List<MemberRoutine> findAchieved() {
-		val memberRoutines = new ArrayList<MemberRoutine>();
-		memberRoutines.addAll(memberRoutineRepository.findByIsAchieved(true).stream()
-			.map(MemberRoutineEntity::toDomain)
-			.toList());
-		memberRoutines.addAll(memberRoutineRepository.findDeletedByIsAchieved(true).stream().map(
-			MemberRoutineEntity::toDomain).toList());
-		return memberRoutines;
+	public void initAllAchievement() {
+		memberRoutineRepository.bulkInitAchievement();
 	}
 
 	private MemberRoutineEntity restore(

src/main/java/com/soptie/server/persistence/adapter/RoutineAdapter.java

@@ -7,7 +7,7 @@
 import com.soptie.server.common.support.RepositoryAdapter;
 import com.soptie.server.domain.routine.Routine;
 import com.soptie.server.persistence.entity.RoutineEntity;
-import com.soptie.server.persistence.repository.RoutineRepository;
+import com.soptie.server.persistence.repository.routine.RoutineRepository;
 
 import lombok.RequiredArgsConstructor;
 

src/main/java/com/soptie/server/persistence/entity/MemberEntity.java

@@ -28,13 +28,22 @@ public class MemberEntity extends BaseEntity {
 	@Column(nullable = false)
 	private int rainbowCottonCount;
 
+	//TODO: 2번째 생성자 활용(Entity 보호)
 	public MemberEntity(SocialType socialType, String socialId) {
 		this.socialType = socialType;
 		this.socialId = socialId;
 		this.basicCottonCount = 0;
 		this.rainbowCottonCount = 0;
 	}
 
+	public MemberEntity(Member member) {
+		this.socialType = member.getSocialInfo().getSocialType();
+		this.socialId = member.getSocialInfo().getSocialId();
+		this.refreshToken = member.getRefreshToken();
+		this.basicCottonCount = member.getCottonInfo().getBasicCottonCount();
+		this.rainbowCottonCount = member.getCottonInfo().getRainbowCottonCount();
+	}
+
 	public void update(Member member) {
 		this.refreshToken = member.getRefreshToken();
 		this.basicCottonCount = member.getCottonInfo().getBasicCottonCount();

src/main/java/com/soptie/server/persistence/entity/MemberRoutineEntity.java

@@ -38,6 +38,7 @@ public class MemberRoutineEntity extends BaseEntity {
 	@Column(nullable = false)
 	private long routineId;
 
+	//TODO: 아래 생성자 활용 (Entity 보호)
 	public MemberRoutineEntity(Member member, Routine routine) {
 		this.isAchieved = false;
 		this.isAchievedToday = false;
@@ -47,6 +48,15 @@ public MemberRoutineEntity(Member member, Routine routine) {
 		this.routineId = routine.getId();
 	}
 
+	public MemberRoutineEntity(MemberRoutine memberRoutine) {
+		this.isAchieved = memberRoutine.isAchieved();
+		this.isAchievedToday = memberRoutine.isAchievedToday();
+		this.achievementCount = memberRoutine.getAchievementCount();
+		this.isDeleted = false;
+		this.memberId = memberRoutine.getMemberId();
+		this.routineId = memberRoutine.getRoutineId();
+	}
+
 	public MemberRoutine toDomain() {
 		return MemberRoutine.builder()
 			.id(this.id)

src/main/java/com/soptie/server/persistence/entity/RoutineEntity.java

@@ -5,17 +5,25 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
+import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 @Entity
 @Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 @Table(name = "routine", schema = "softie")
 public class RoutineEntity extends BaseEntity {
 	@Column(nullable = false)
 	private String content;
 	@Column(nullable = false)
 	private long themeId;
 
+	public RoutineEntity(Routine routine) {
+		this.content = routine.getContent();
+		this.themeId = routine.getThemeId();
+	}
+
 	public Routine toDomain() {
 		return Routine.builder()
 			.id(this.id)

src/main/java/com/soptie/server/persistence/repository/MemberRoutineRepository.java → src/main/java/com/soptie/server/persistence/repository/routine/MemberRoutineRepository.java

@@ -1,4 +1,4 @@
-package com.soptie.server.persistence.repository;
+package com.soptie.server.persistence.repository.routine;
 
 import java.util.List;
 
@@ -7,25 +7,20 @@
 import org.springframework.data.jpa.repository.Query;
 
 import com.soptie.server.persistence.entity.MemberRoutineEntity;
+import com.soptie.server.persistence.repository.routine.custom.MemberRoutineCustomRepository;
+
+public interface MemberRoutineRepository
+	extends JpaRepository<MemberRoutineEntity, Long>, MemberRoutineCustomRepository {
 
-public interface MemberRoutineRepository extends JpaRepository<MemberRoutineEntity, Long> {
 	@Query(
 		value = "SELECT * FROM member_routine WHERE member_id = :memberId AND is_deleted = true",
 		nativeQuery = true)
 	List<MemberRoutineEntity> findDeletedByMemberId(long memberId);
 
-	@Query(
-		value = "SELECT * FROM member_routine WHERE is_achieved = :isAchieved AND is_deleted = true",
-		nativeQuery = true)
-	List<MemberRoutineEntity> findDeletedByIsAchieved(boolean isAchieved);
-
 	List<MemberRoutineEntity> findByMemberId(long memberId);
 
 	List<MemberRoutineEntity> findByIdIn(List<Long> ids);
 
-	@SuppressWarnings("SpringDataMethodInconsistencyInspection")
-	List<MemberRoutineEntity> findByIsAchieved(boolean isAchieved);
-
 	@Modifying
 	@Query(
 		value = "DELETE FROM member_routine WHERE member_id = :memberId",

src/main/java/com/soptie/server/persistence/repository/RoutineRepository.java → src/main/java/com/soptie/server/persistence/repository/routine/RoutineRepository.java

@@ -1,4 +1,4 @@
-package com.soptie.server.persistence.repository;
+package com.soptie.server.persistence.repository.routine;
 
 import java.util.List;
 

src/main/java/com/soptie/server/persistence/repository/routine/custom/MemberRoutineCustomRepository.java

@@ -0,0 +1,7 @@
+package com.soptie.server.persistence.repository.routine.custom;
+
+public interface MemberRoutineCustomRepository {
+	void bulkInitAchievement();
+
+	long countByAchieved(boolean isAchieved);
+}

src/main/java/com/soptie/server/persistence/repository/routine/custom/MemberRoutineRepositoryImpl.java

@@ -0,0 +1,33 @@
+package com.soptie.server.persistence.repository.routine.custom;
+
+import static com.soptie.server.persistence.entity.QMemberRoutineEntity.*;
+
+import org.springframework.stereotype.Repository;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+
+import lombok.RequiredArgsConstructor;
+
+@Repository
+@RequiredArgsConstructor
+public class MemberRoutineRepositoryImpl implements MemberRoutineCustomRepository {
+
+	private final JPAQueryFactory queryFactory;
+
+	@Override
+	public void bulkInitAchievement() {
+		queryFactory.update(memberRoutineEntity)
+			.set(memberRoutineEntity.isAchieved, false)
+			.set(memberRoutineEntity.isAchievedToday, false)
+			.where(memberRoutineEntity.isAchieved.isTrue())
+			.execute();
+	}
+
+	@Override
+	public long countByAchieved(boolean isAchieved) {
+		return queryFactory
+			.selectFrom(memberRoutineEntity)
+			.where(memberRoutineEntity.isAchieved.eq(isAchieved))
+			.stream().count();
+	}
+}

src/main/resources/application-dev.yml

@@ -31,7 +31,7 @@ jwt:
   ACCESS_TOKEN_EXPIRED: 7200000
   REFRESH_TOKEN_EXPIRED: 1209600000
 
-softie:
+batch:
   cron:
     init:
       routine: "0 0 0 * * *"

src/main/resources/application-prod.yml

@@ -31,7 +31,7 @@ jwt:
   ACCESS_TOKEN_EXPIRED: 7200000
   REFRESH_TOKEN_EXPIRED: 1209600000
 
-softie:
+batch:
   cron:
     init:
       routine: "0 0 0 * * *"