Skip to content

Commit de0364c

Browse files
committed
refactor: 연구실 이름 사전 순으로 정렬
1 parent bcb801c commit de0364c

4 files changed

Lines changed: 9 additions & 7 deletions

File tree

aics-api/src/main/java/kgu/developers/api/lab/application/LabService.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ public class LabService {
2222

2323
@Transactional
2424
public LabPersistResponse createLab(LabRequest request) {
25-
int adjustedPriority = priorityService.adjustToMaxPlusOne(Lab.class, request.priority());
26-
priorityService.updatePriority(Lab.class, adjustedPriority);
25+
int adjustedPriority = priorityService.createAdjustPriority(Lab.class, request.priority());
2726

2827
Lab lab = Lab.create(adjustedPriority, request.name(), request.loc(), request.site());
2928
labRepository.save(lab);
@@ -33,16 +32,19 @@ public LabPersistResponse createLab(LabRequest request) {
3332

3433
@Transactional(readOnly = true)
3534
public LabListResponse getLabs() {
36-
List<Lab> labs = labRepository.findByDeletedAtIsNullOrderByPriority();
35+
List<Lab> labs = labRepository.findByDeletedAtIsNullOrderByName();
3736
return LabListResponse.from(labs);
3837
}
3938

4039
@Transactional
4140
public void updateLab(Long id, LabRequest request) {
41+
int adjustedPriority = priorityService.updateAdjustPriority(Lab.class, request.priority());
42+
4243
Lab lab = getById(id);
4344
lab.updateName(request.name());
4445
lab.updateLoc(request.loc());
4546
lab.updateSite(request.site());
47+
lab.updatePriority(adjustedPriority);
4648
}
4749

4850
@Transactional

aics-domain/src/main/java/kgu/developers/domain/lab/domain/LabRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public interface LabRepository {
88

99
Optional<Lab> findById(Long id);
1010

11-
List<Lab> findByDeletedAtIsNullOrderByPriority();
11+
List<Lab> findByDeletedAtIsNullOrderByName();
1212

1313
void delete(Lab lab);
1414
}

aics-domain/src/main/java/kgu/developers/domain/lab/infrastructure/JpaLabRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
import kgu.developers.domain.lab.domain.Lab;
88

99
public interface JpaLabRepository extends JpaRepository<Lab, Long> {
10-
List<Lab> findByDeletedAtIsNullOrderByPriority();
10+
List<Lab> findByDeletedAtIsNullOrderByName();
1111
}

aics-domain/src/main/java/kgu/developers/domain/lab/infrastructure/LabRepositoryImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public Optional<Lab> findById(Long id) {
2525
}
2626

2727
@Override
28-
public List<Lab> findByDeletedAtIsNullOrderByPriority() {
29-
return jpaLabRepository.findByDeletedAtIsNullOrderByPriority();
28+
public List<Lab> findByDeletedAtIsNullOrderByName() {
29+
return jpaLabRepository.findByDeletedAtIsNullOrderByName();
3030
}
3131

3232
@Override

0 commit comments

Comments
 (0)