Skip to content

Commit

Permalink
Merge pull request #12 from softeerbootcamp4th/feat/addRank
Browse files Browse the repository at this point in the history
[feat] 선착순 응모 요청 처리시 DB에 저장하는 로직 추가
  • Loading branch information
eckrin authored Aug 5, 2024
2 parents 00628e8 + 764695b commit 0477610
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
import com.softeer.podoarrival.event.exception.ExistingUserException;
import com.softeer.podoarrival.event.model.dto.ArrivalApplicationResponseDto;
import com.softeer.podoarrival.security.AuthInfo;
import com.softeer.podoarrival.user.model.entity.ArrivalUser;
import com.softeer.podoarrival.user.model.entity.Role;
import com.softeer.podoarrival.user.repository.ArrivalUserRepository;
import lombok.RequiredArgsConstructor;
import org.redisson.api.BatchResult;
import org.redisson.api.RBatch;
Expand All @@ -18,6 +21,7 @@
public class ArrivalEventService {

private final RedissonClient redissonClient;
private final ArrivalUserRepository arrivalUserRepository;

private final String FINISHED = "finished";
private final String ARRIVAL_SET = "arrivalset";
Expand Down Expand Up @@ -45,6 +49,14 @@ public ArrivalApplicationResponseDto applyEvent(AuthInfo authInfo){
}

if((int) res.getResponses().get(1) <= MAX_ARRIVAL){
arrivalUserRepository.save(
ArrivalUser.builder()
.name(authInfo.getName())
.phoneNum(authInfo.getPhoneNum())
.role(Role.ROLE_USER)
.arrivalRank((int) res.getResponses().get(1))
.build()
);
return new ArrivalApplicationResponseDto("선착순 응모에 성공했습니다.");
}else{
check.set(FINISHED);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class User extends DateEntity {

public class ArrivalUser extends DateEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "user_id")
Expand All @@ -25,6 +24,8 @@ public class User extends DateEntity {

@Column(name = "phone_number", unique = true)
private String phoneNum;
@Column(name = "arrival_rank")
private int arrivalRank;
@Enumerated(EnumType.STRING)
private Role role;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.softeer.podoarrival.user.repository;

import com.softeer.podoarrival.user.model.entity.ArrivalUser;
import org.springframework.data.jpa.repository.JpaRepository;

public interface ArrivalUserRepository extends JpaRepository<ArrivalUser, Long> {
ArrivalUser findByNameAndPhoneNum(String name, String phoneNum);
boolean existsByPhoneNum(String phoneNum);
}

This file was deleted.

0 comments on commit 0477610

Please sign in to comment.