-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #16 from IT-Cotato/feature/refactor-room
refactor: Room 변경(#15)
- Loading branch information
Showing
7 changed files
with
130 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
backend/src/main/java/middle_point_search/backend/domains/Room/dto/RoomDTO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...end/src/main/java/middle_point_search/backend/domains/Room/repository/RoomRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
backend/src/main/java/middle_point_search/backend/domains/Room/service/RoomService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
backend/src/main/java/middle_point_search/backend/domains/place/domain/Place.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,97 @@ | ||
package middle_point_search.backend.domains.place.domain; | ||
|
||
import jakarta.persistence.Column; | ||
import jakarta.persistence.Entity; | ||
import jakarta.persistence.EnumType; | ||
import jakarta.persistence.Enumerated; | ||
import jakarta.persistence.GeneratedValue; | ||
import jakarta.persistence.GenerationType; | ||
import jakarta.persistence.Id; | ||
import jakarta.persistence.JoinColumn; | ||
import jakarta.persistence.ManyToOne; | ||
import jakarta.persistence.OneToOne; | ||
import lombok.AccessLevel; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
import middle_point_search.backend.domains.member.domain.Member; | ||
import middle_point_search.backend.domains.member.domain.Transport; | ||
import middle_point_search.backend.domains.room.domain.Room; | ||
|
||
@Entity | ||
@Getter | ||
@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
public class Place { | ||
|
||
@Id | ||
@Column(name = "PLACE_ID") | ||
@GeneratedValue(strategy = GenerationType.IDENTITY) | ||
private Long id; | ||
|
||
@Enumerated(EnumType.STRING) | ||
private Transport transport; | ||
|
||
@Column(nullable = false) | ||
private String siDo; | ||
|
||
@Column(nullable = false) | ||
private String siGunGu; | ||
|
||
@Column(nullable = false) | ||
private String roadNameAddress; | ||
|
||
@Column(nullable = false) | ||
private Double addressLatitude; | ||
|
||
@Column(nullable = false) | ||
private Double addressLongitude; | ||
|
||
@ManyToOne | ||
@JoinColumn(name = "ROOM_ID") | ||
private Room room; | ||
|
||
@OneToOne(mappedBy = "place") | ||
private Member member; | ||
|
||
public Place(Transport transport, String siDo, String siGunGu, String roadNameAddress, Double addressLatitude, | ||
Double addressLongitude, Room room) { | ||
this.transport = transport; | ||
this.siDo = siDo; | ||
this.siGunGu = siGunGu; | ||
this.roadNameAddress = roadNameAddress; | ||
this.addressLatitude = addressLatitude; | ||
this.addressLongitude = addressLongitude; | ||
addRoom(room); | ||
} | ||
|
||
public Place(Transport transport, String siDo, String siGunGu, String roadNameAddress, Double addressLatitude, | ||
Double addressLongitude, Room room, Member member) { | ||
this.transport = transport; | ||
this.siDo = siDo; | ||
this.siGunGu = siGunGu; | ||
this.roadNameAddress = roadNameAddress; | ||
this.addressLatitude = addressLatitude; | ||
this.addressLongitude = addressLongitude; | ||
addRoom(room); | ||
addMember(member); | ||
} | ||
|
||
public static Place of(Transport transport, String siDo, String siGunGu, String roadNameAddress, | ||
Double addressLatitude, Double addressLongitude, Room room) { | ||
return new Place(transport, siDo, siGunGu, roadNameAddress, addressLatitude, addressLongitude, room); | ||
} | ||
|
||
public static Place of(Transport transport, String siDo, String siGunGu, String roadNameAddress, | ||
Double addressLatitude, Double addressLongitude, Room room, Member member) { | ||
return new Place(transport, siDo, siGunGu, roadNameAddress, addressLatitude, addressLongitude, room, member); | ||
} | ||
|
||
private void addRoom(Room room) { | ||
this.room = room; | ||
room.getPlaces().add(this); | ||
} | ||
|
||
private void addMember(Member member) { | ||
this.member = member; | ||
member.setPlace(this); | ||
} | ||
} |