Merge branch 'develop' of https://github.com/team-moabam/moabam-BE in…

…to fix/#224-admin-token-fix # Conflicts: # src/main/java/com/moabam/api/application/room/RoomService.java
team-moabam · Dec 3, 2023 · d772928 · d772928
2 parents c627fe5 + 12b5f08
commit d772928
Show file tree

Hide file tree

Showing 7 changed files with 227 additions and 226 deletions.
diff --git a/infra/mysql/initdb.d/init.sql b/infra/mysql/initdb.d/init.sql
@@ -212,6 +212,7 @@ create table room
     announcement       varchar(100),
     room_image         varchar(500),
     manager_nickname   varchar(30),
+    deleted_at         datetime(6),
     created_at         datetime(6)       not null,
     updated_at         datetime(6),
     primary key (id)

diff --git a/src/main/java/com/moabam/api/application/room/CertificationService.java b/src/main/java/com/moabam/api/application/room/CertificationService.java
@@ -115,14 +115,6 @@ public Certification findCertification(Long certificationId) {
 			.orElseThrow(() -> new NotFoundException(CERTIFICATION_NOT_FOUND));
 	}
 
-	public List<Certification> findCertifications(List<Routine> routines) {
-		return certificationsSearchRepository.findCertificationsByRoutines(routines);
-	}
-
-	public void deleteCertifications(List<Certification> certifications) {
-		certificationRepository.deleteAll(certifications);
-	}
-
 	private void validateCertifyTime(LocalDateTime now, int certifyTime) {
 		LocalTime targetTime = LocalTime.of(certifyTime, 0);
 		LocalDateTime targetDateTime = LocalDateTime.of(now.toLocalDate(), targetTime);