Skip to content

Commit 74d0a11

Browse files
authored
Merge pull request #258 from CSE-Shaco/develop
fix(manito): Lob 삭제 및 Transactional 추가
2 parents 7e7960a + 5453dc1 commit 74d0a11

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

src/main/java/inha/gdgoc/domain/manito/entity/ManitoAssignment.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ public class ManitoAssignment extends BaseEntity {
3131
* clientKey/hash로만 복호화 가능한 암호문
3232
* 처음 업로드 시에는 아직 없을 수 있으므로 nullable 허용
3333
*/
34-
@Lob
35-
@Column(name = "encrypted_manitto") // nullable = true (default)
34+
@Column(name = "encrypted_manitto", columnDefinition = "text")
3635
private String encryptedManitto;
3736

3837
@Column(name = "pin_hash", nullable = false, length = 255)
@@ -58,4 +57,4 @@ public void changeEncryptedManitto(String encryptedManitto) {
5857
public void changeName(String name) {
5958
this.name = name;
6059
}
61-
}
60+
}}

src/main/java/inha/gdgoc/domain/manito/service/ManitoUserService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
import lombok.extern.slf4j.Slf4j;
1111
import org.springframework.security.crypto.password.PasswordEncoder;
1212
import org.springframework.stereotype.Service;
13+
import org.springframework.transaction.annotation.Transactional;
1314

14-
@Slf4j
1515
@Service
1616
@RequiredArgsConstructor
17+
@Slf4j
1718
public class ManitoUserService {
1819

1920
private final ManitoSessionRepository sessionRepository;
@@ -24,6 +25,7 @@ public class ManitoUserService {
2425
/**
2526
* pin 검증 후 암호문 반환
2627
*/
28+
@Transactional(readOnly = true)
2729
public String verifyAndGetCipher(String sessionCode, String studentId, String pinPlain) {
2830

2931
log.info("[MANITO] >>> verifyAndGetCipher CALLED (sessionCode={}, studentId={})", sessionCode, studentId);
@@ -34,9 +36,7 @@ public String verifyAndGetCipher(String sessionCode, String studentId, String pi
3436
ManitoAssignment assignment = assignmentRepository.findBySessionAndStudentId(session, studentId)
3537
.orElseThrow(() -> new BusinessException(GlobalErrorCode.RESOURCE_NOT_FOUND, "해당 학번은 세션에 참여하지 않았습니다."));
3638

37-
// ✅ Admin 쪽과 동일한 규칙으로 PIN 정규화
3839
String normalizedPin = manitoPinPolicy.normalize(pinPlain);
39-
4040
if (normalizedPin.isEmpty()) {
4141
throw new BusinessException(GlobalErrorCode.BAD_REQUEST, "PIN 형식이 올바르지 않습니다.");
4242
}

0 commit comments

Comments
 (0)