Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import java.util.Arrays;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Profile;
import org.springframework.lang.NonNull;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
Expand All @@ -24,7 +23,6 @@

@Slf4j
@Component
@Profile("!local")
@RequiredArgsConstructor
public class JwtAuthenticationFilter extends OncePerRequestFilter {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@
import java.io.IOException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Component;
import org.springframework.web.filter.OncePerRequestFilter;
import org.springframework.web.servlet.HandlerExceptionResolver;

@Slf4j
@Component
@Profile("!local")
public class JwtExceptionFilter extends OncePerRequestFilter {

private final HandlerExceptionResolver resolver;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.springframework.boot.autoconfigure.security.servlet.PathRequest;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
import org.springframework.http.HttpMethod;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
Expand All @@ -31,7 +30,6 @@
@Configuration
@EnableMethodSecurity
@RequiredArgsConstructor
@Profile("!local")
public class SecurityConfig {

// CORS
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Rent updateRent(

rent.validateMine(memberId);

rentRepository.deleteBoardingDateAllByRentId(rentUpdateRequest.rentId());
rentRepository.deleteBoardingInfoAllByRentId(rentUpdateRequest.rentId());
rent.updateRent(rentUpdateRequest);
return rent;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.backend.allreva.common.model.Image;
import com.backend.allreva.rent.command.domain.Rent;
import com.backend.allreva.rent.command.domain.RentBoardingDate;
import com.backend.allreva.rent.command.domain.RentBoardingInfo;
import com.backend.allreva.rent.command.domain.value.AdditionalInfo;
import com.backend.allreva.rent.command.domain.value.Bus;
import com.backend.allreva.rent.command.domain.value.BusSize;
Expand Down Expand Up @@ -68,14 +68,17 @@ public record RentRegisterRequest(
public Rent toEntity(
final Long memberId
) {
List<RentBoardingInfo> rentBoardingInfos = rentBoardingDateRequests.stream()
.map(date -> RentBoardingInfo.builder()
.date(date)
.recruitmentCount(recruitmentCount)
.build())
.toList();

Rent rent = Rent.builder()
.memberId(memberId)
.concertId(concertId)
.boardingDates(rentBoardingDateRequests.stream()
.map(request -> RentBoardingDate.builder()
.date(request)
.build())
.toList())
.boardingInfos(rentBoardingInfos)
.detailInfo(DetailInfo.builder()
.image(image)
.title(title)
Expand All @@ -99,20 +102,14 @@ public Rent toEntity(
.build())
.build())
.additionalInfo(AdditionalInfo.builder()
.recruitmentCount(recruitmentCount)
.chatUrl(chatUrl)
.refundType(refundType)
.information(information)
.endDate(endDate)
.build())
.build();

List<RentBoardingDate> rentBoardingDates = rentBoardingDateRequests.stream()
.map(date -> RentBoardingDate.builder()
.date(date)
.build())
.toList();
rent.assignBoardingDates(rentBoardingDates);
rent.assignBoardingInfos(rentBoardingInfos);
return rent;
}
}
21 changes: 11 additions & 10 deletions src/main/java/com/backend/allreva/rent/command/domain/Rent.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@
@AllArgsConstructor(access = AccessLevel.PRIVATE)
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@SQLRestriction("deleted_at is NULL")
@SQLDelete(sql = "UPDATE rent_form SET deleted_at = NOW() WHERE id = ?")
@SQLDelete(sql = "UPDATE rent SET deleted_at = NOW() WHERE id = ?")
@Entity
@Table(name = "rent_form")
@Table(name = "rent")
public class Rent extends BaseEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
Expand All @@ -58,15 +59,15 @@ public class Rent extends BaseEntity {

@Builder.Default
@OneToMany(mappedBy = "rent", cascade = CascadeType.ALL)
private List<RentBoardingDate> boardingDates = new ArrayList<>();
private List<RentBoardingInfo> boardingInfos = new ArrayList<>();

@Builder.Default
@Column(nullable = false)
private boolean isClosed = false; //마감 여부

public void assignBoardingDates(List<RentBoardingDate> boardingDates) {
boardingDates.forEach(boardingDate -> boardingDate.assignRent(this));
this.boardingDates = boardingDates;
public void assignBoardingInfos(List<RentBoardingInfo> boardingInfos) {
boardingInfos.forEach(boardingInfo -> boardingInfo.assignRent(this));
this.boardingInfos = boardingInfos;
}

public void updateRent(
Expand Down Expand Up @@ -95,19 +96,19 @@ public void updateRent(
.build())
.build();
this.additionalInfo = AdditionalInfo.builder()
.recruitmentCount(request.recruitmentCount())
.chatUrl(request.chatUrl())
.refundType(request.refundType())
.information(request.information())
.endDate(request.endDate())
.build();
List<RentBoardingDate> rentBoardingDates = request.rentBoardingDateRequests().stream()
.map(date -> RentBoardingDate.builder()
List<RentBoardingInfo> rentBoardingInfos = request.rentBoardingDateRequests().stream()
.map(date -> RentBoardingInfo.builder()
.rent(this)
.date(date)
.recruitmentCount(request.recruitmentCount())
.build())
.toList();
assignBoardingDates(rentBoardingDates);
assignBoardingInfos(rentBoardingInfos);
isClosed = false;

Events.raise(new RentSaveEvent(this));
Expand Down

This file was deleted.

This file was deleted.

Loading