Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/test/85-create-test-code' into t…
Browse files Browse the repository at this point in the history
…est/85-create-test-code

# Conflicts:
#	src/main/java/ssu/eatssu/domain/menu/entity/Meal.java
#	src/main/java/ssu/eatssu/domain/menu/presentation/MealController.java
#	src/main/java/ssu/eatssu/domain/menu/service/MenuService.java
#	src/main/java/ssu/eatssu/domain/menu/util/MenuValidator.java
#	src/main/java/ssu/eatssu/domain/restaurant/repository/RestaurantRepository.java
  • Loading branch information
packdev937 committed Jan 20, 2024
2 parents 95288cb + 65720be commit d67b0af
Showing 1 changed file with 29 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
//package ssu.eatssu.domain.restaurant.entity;
//
//import jakarta.persistence.*;
//import lombok.AccessLevel;
//import lombok.Getter;
//import lombok.NoArgsConstructor;
//
//import java.util.List;
//import ssu.eatssu.domain.menu.entity.Meal;
//import ssu.eatssu.domain.menu.entity.Menu;
//
//@Entity
//@Getter
//@NoArgsConstructor(access = AccessLevel.PROTECTED)
//public class TemporalRestaurant {
//
// @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
// @Column(name = "restaurant_id")
// private Long id;
//
// @Enumerated(EnumType.STRING)
// private Restaurant restaurantName;
//
// @OneToMany(mappedBy = "restaurant", cascade = CascadeType.ALL)
// private List<Menu> menus;
//
// @OneToMany(mappedBy = "restaurant", cascade = CascadeType.ALL)
// private List<Meal> meals;
//}

0 comments on commit d67b0af

Please sign in to comment.