Skip to content

Commit

Permalink
refactor: 패키지 이름 mockData로 수정
Browse files Browse the repository at this point in the history
Related: #54
  • Loading branch information
hoa0217 committed Mar 20, 2024
1 parent 357db20 commit 8a70875
Show file tree
Hide file tree
Showing 16 changed files with 71 additions and 88 deletions.
60 changes: 0 additions & 60 deletions src/main/java/com/modoospace/data/service/DataService.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
package com.modoospace.data.controller.dto;
package com.modoospace.mockData.controller.dto;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.modoospace.data.controller.dto.address.Document;
import com.modoospace.mockData.controller.dto.address.Document;
import com.modoospace.space.domain.Address;
import lombok.Getter;
import lombok.Setter;

import java.util.ArrayList;
import java.util.List;

@Getter
@Setter
@JsonIgnoreProperties(ignoreUnknown = true)
public class AddressResponse {
public class MockAddressResponse {

List<Document> documents;
List<Document> documents = new ArrayList<>();

public Address toAddress(String detailAddress) {
Document document = documents.get(0);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.modoospace.data.controller.dto;
package com.modoospace.mockData.controller.dto;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.modoospace.data.controller.dto.space.*;
import com.modoospace.member.domain.Member;
import com.modoospace.mockData.controller.dto.space.*;
import com.modoospace.space.domain.*;
import lombok.Getter;
import lombok.Setter;
Expand All @@ -17,7 +17,7 @@
@Getter
@Setter
@JsonIgnoreProperties(ignoreUnknown = true)
public class SpaceResponse {
public class MockSpaceResponse {

@JsonProperty("products")
private List<FacilityResponse> facilityResponses = new ArrayList<>();
Expand All @@ -40,8 +40,7 @@ public String getCategoryName() {
return facilityResponses.stream()
.findFirst()
.flatMap(p -> p.getCategories().stream().findFirst())
.map(FacilityCategory::getName)
.get();
.map(FacilityCategory::getName).orElse("스터디룸");
}

public Space toSpace(Address address, Category category, Member member) {
Expand Down Expand Up @@ -83,11 +82,10 @@ public TimeSettings getTimeSettings() {
// end 10 ~ start 2
private static List<TimeRange> makeTimeRangeFromBreakTime(BreakTime breakTime) {
List<TimeRange> list = new ArrayList<>();
if(breakTime.getEndHour() > breakTime.getStartHour()) {
if (breakTime.getEndHour() > breakTime.getStartHour()) {
list.add(new TimeRange(breakTime.getEndHour(), 24));
list.add(new TimeRange(0, breakTime.getStartHour()));
}
else {
} else {
list.add(new TimeRange(breakTime.getEndHour(), breakTime.getStartHour()));
}
return list;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.modoospace.data.controller.dto.address;
package com.modoospace.mockData.controller.dto.address;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.modoospace.data.controller.dto.address;
package com.modoospace.mockData.controller.dto.address;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.modoospace.data.controller.dto.address;
package com.modoospace.mockData.controller.dto.address;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.modoospace.data.controller.dto.space;
package com.modoospace.mockData.controller.dto.space;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.modoospace.data.controller.dto.space;
package com.modoospace.mockData.controller.dto.space;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.modoospace.data.controller.dto.space;
package com.modoospace.mockData.controller.dto.space;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.modoospace.data.controller.dto.space;
package com.modoospace.mockData.controller.dto.space;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Getter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.modoospace.data.controller.dto.space;
package com.modoospace.mockData.controller.dto.space;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.modoospace.data.controller.dto.space;
package com.modoospace.mockData.controller.dto.space;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.modoospace.space.domain.Facility;
Expand All @@ -8,6 +8,7 @@
import lombok.Getter;
import lombok.Setter;

import java.util.ArrayList;
import java.util.List;

@Getter
Expand All @@ -16,7 +17,7 @@
public class FacilityResponse {

FacilityInfo info;
List<FacilityCategory> categories;
List<FacilityCategory> categories = new ArrayList<>();

public Facility toFacility(TimeSettings timeSettings, WeekdaySettings weekdaySettings, Space space) {
return Facility.builder()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.modoospace.data.controller.dto.space;
package com.modoospace.mockData.controller.dto.space;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.modoospace.data.controller.dto.space;
package com.modoospace.mockData.controller.dto.space;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down
47 changes: 47 additions & 0 deletions src/main/java/com/modoospace/mockData/service/MockDataService.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package com.modoospace.mockData.service;

import com.modoospace.member.domain.Member;
import com.modoospace.member.service.MemberService;
import com.modoospace.mockData.controller.dto.MockAddressResponse;
import com.modoospace.mockData.controller.dto.MockSpaceResponse;
import com.modoospace.space.domain.*;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.Optional;

@Service
@RequiredArgsConstructor
public class MockDataService {

private final MemberService memberService;
private final CategoryRepository categoryRepository;
private final SpaceRepository spaceRepository;
private final SpaceIndexRepository spaceIndexRepository;
private final FacilityRepository facilityRepository;

public Long saveEntity(MockSpaceResponse spaceResponse, MockAddressResponse addressResponse, String email) {
Space space = makeSpace(spaceResponse, addressResponse, email);
spaceIndexRepository.save(SpaceIndex.of(space));
makeFacility(spaceResponse, space);
return space.getId();
}

private Space makeSpace(MockSpaceResponse spaceResponse, MockAddressResponse addressResponse, String email) {
Member member = memberService.findMemberByEmail(email);
Address address = addressResponse.toAddress(spaceResponse.getLocation().getDetailAddress());
Category category = findCategory(spaceResponse.getCategoryName());

return spaceRepository.save(spaceResponse.toSpace(address, category, member));
}

private Category findCategory(String name) {
Optional<Category> optionalCategory = categoryRepository.findByName(name);
return optionalCategory.orElseGet(() -> categoryRepository.save(new Category(name)));
}

private void makeFacility(MockSpaceResponse spaceResponse, Space space) {
spaceResponse.getFacilityResponses()
.forEach(product -> facilityRepository.save(product.toFacility(spaceResponse.getTimeSettings(), spaceResponse.getWeekdaySettings(), space)));
}
}
4 changes: 0 additions & 4 deletions src/main/java/com/modoospace/space/domain/Space.java
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,4 @@ public void verifyDeletePermission(Member loginMember) {
private boolean hasFacilities() {
return !facilities.isEmpty();
}

public void setFacilities(List<Facility> facilities) {
this.facilities.addAll(facilities);
}
}

0 comments on commit 8a70875

Please sign in to comment.