Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#19] [FEATURE] : 공통 필수 엔티티 추가 #20

Merged
merged 2 commits into from
Sep 26, 2024
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
@@ -0,0 +1,82 @@
package com.nbe2.domain.emergencyroom;

import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Embedded;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;

import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

import com.nbe2.domain.global.BaseTimeEntity;

@Entity
@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Table(name = "emergency_rooms")
public class EmergencyRoom extends BaseTimeEntity {

@Id
@Column(name = "emergency_room_id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

private String hospitalName;

private String zipCode;

private String address;

private String mainContactNumber;

private String emergencyRoomContactNumber;

private String simpleMap;

private boolean emergencyRoomAvailability;

private String medicalDepartments;

@Embedded private Location location;

@Embedded private BedCount bedCount;

@Embeddable
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
@Builder
public static class Location {
private String longitude;

private String latitude;
}

@Embeddable
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
@Builder
public static class BedCount {
private int totalBedCount;

private int thoracicIcuBedCount;

private int neurologicalIcuBedCount;

private int emergencyRoomBedCount;

private int generalWardBedCount;

private int generalIcuBedCount;

private int neonatalIcuBedCount;

private int operatingRoomBedCount;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.nbe2.domain.emergencyroom;

public record EmergencyRoomInfo(
Long id,
String hospitalName,
String zipCode,
String address,
String mainContactNumber,
String emergencyRoomContactNumber,
String simpleMap,
boolean emergencyRoomAvailability,
String longitude,
String latitude,
String medicalDepartments,
int totalBedCount,
int thoracicIcuBedCount,
int neurologicalIcuBedCount,
int emergencyRoomBedCount,
int generalWardBedCount,
int generalIcuBedCount,
int neonatalIcuBedCount,
int operatingRoomBedCount) {}
49 changes: 49 additions & 0 deletions ea-domain/src/main/java/com/nbe2/domain/notice/Notice.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package com.nbe2.domain.notice;

import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table;

import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;

import com.nbe2.domain.emergencyroom.EmergencyRoom;
import com.nbe2.domain.global.BaseTimeEntity;

@Entity
@Getter
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@Table(name = "notices")
public class Notice extends BaseTimeEntity {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long noticeId;

// private EmergencyRoom emergencyRoom;
private String title;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "emergency_room_id")
private EmergencyRoom emergencyRoom;

/*
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "user_id")
priavte User user;
*/

private double speedScore;

private double kindScore;

private double facilityScore;

private String content;
}
18 changes: 15 additions & 3 deletions ea-domain/src/main/java/com/nbe2/domain/user/User.java
Original file line number Diff line number Diff line change
@@ -1,22 +1,34 @@
package com.nbe2.domain.user;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;

import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

import com.nbe2.domain.global.BaseTimeEntity;

@Entity
@Getter
@AllArgsConstructor
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class User {
@Table(name = "users")
public class User extends BaseTimeEntity {

@Id private String id;
@Id
@Column(name = "user_id")
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

private String nickname;
private String name;

private String email;

private String password;
}