Skip to content

main <- develop #194

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

Merged
merged 5 commits into from
May 11, 2025
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ out/

### VS Code ###
.vscode/

### 환경 변수 ###
.env
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
import lombok.Getter;
import lombok.NoArgsConstructor;

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

@Entity
@Getter
@Table(name = "tb_free_pub")
Expand Down Expand Up @@ -38,4 +42,17 @@ public class FreePub {

@Column(nullable = false)
private Double longitude;

@Column
private Date operatingDate;

@Column(length = 1500)
private String content;

@Column(nullable = false)
@Enumerated(EnumType.STRING)
private Type type;

@OneToMany(mappedBy = "freePub", cascade = CascadeType.ALL, orphanRemoval = true)
private List<PubImage> images = new ArrayList<>();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package devkor.com.teamcback.domain.koyeon.entity;

import jakarta.persistence.*;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Entity
@Getter
@Table(name = "tb_pub_image")
@NoArgsConstructor
public class PubImage {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Column(nullable = false)
private String imageUrl;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "freePub_id")
private FreePub freePub;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package devkor.com.teamcback.domain.koyeon.entity;

public enum Type {
PUB, BOOTH;
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ public enum PlaceType {
BOOK_RETURN_MACHINE("도서반납기", new String[]{"책반납기계", "도서반납기계"}),
TUMBLER_WASHER("텀블러세척기", new String[]{}),
ONESTOP_AUTO_MACHINE("원스탑무인발급기", new String[]{"원스톱무인발급기", "증명서", "ONE-STOP", "ONESTOP"}),
HEALTH_OFFICE("건강센터", new String[]{"약받는곳", "보건실", "양호실", "응급약", "약받을수있는", "다쳤을때"});
HEALTH_OFFICE("건강센터", new String[]{"약받는곳", "보건실", "양호실", "응급약", "약받을수있는", "다쳤을때"}),
DISABLED_PARKING("장애인주차장", new String[] {"장애인주차장", "베리어프리", "휠체어주차장"});

private final String name;
private final String[] nickname;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public class SearchService {
private final List<PlaceType> outerTagTypes = Arrays.asList(PlaceType.CAFE, PlaceType.CAFETERIA, PlaceType.CONVENIENCE_STORE,
PlaceType.READING_ROOM, PlaceType.STUDY_ROOM, PlaceType.BOOK_RETURN_MACHINE, PlaceType.LOUNGE, PlaceType.WATER_PURIFIER,
PlaceType.VENDING_MACHINE, PlaceType.PRINTER, PlaceType.TUMBLER_WASHER, PlaceType.ONESTOP_AUTO_MACHINE, PlaceType.BANK,
PlaceType.SMOKING_BOOTH, PlaceType.SHOWER_ROOM, PlaceType.GYM, PlaceType.SLEEPING_ROOM, PlaceType.HEALTH_OFFICE);
PlaceType.SMOKING_BOOTH, PlaceType.SHOWER_ROOM, PlaceType.GYM, PlaceType.SLEEPING_ROOM, PlaceType.HEALTH_OFFICE, PlaceType.DISABLED_PARKING);

/**
* 통합 검색
Expand Down
Loading