-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Feat/#120
- Loading branch information
Showing
6 changed files
with
92 additions
and
92 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| package com.dear.domain.food.enums; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.util.List; | ||
|
|
||
| @Getter | ||
| @AllArgsConstructor | ||
| public class Food implements Serializable { | ||
|
|
||
| private List<FoodDetail> details; | ||
| private Float calorie; | ||
| } | ||
| //import lombok.AllArgsConstructor; | ||
| //import lombok.Getter; | ||
| // | ||
| //import java.io.Serializable; | ||
| //import java.util.List; | ||
|
|
||
| //@Getter | ||
| //@AllArgsConstructor | ||
| //public class Food implements Serializable { | ||
| // | ||
| // private List<FoodDetail> details; | ||
| // private Float calorie; | ||
| //} |
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 |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| package com.dear.domain.food.enums; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Getter; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.util.List; | ||
|
|
||
| @Getter | ||
| @AllArgsConstructor | ||
| public class FoodDetail implements Serializable { | ||
|
|
||
| private String name; | ||
| private List<Integer> allergies; | ||
| } | ||
| //import lombok.AllArgsConstructor; | ||
| //import lombok.Getter; | ||
| // | ||
| //import java.io.Serializable; | ||
| //import java.util.List; | ||
| // | ||
| //@Getter | ||
| //@AllArgsConstructor | ||
| //public class FoodDetail implements Serializable { | ||
| // | ||
| // private String name; | ||
| // private List<Integer> allergies; | ||
| //} |
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 |
|---|---|---|
| @@ -1,43 +1,43 @@ | ||
| package com.dear.domain.food.enums; | ||
|
|
||
|
|
||
| import com.fasterxml.jackson.annotation.JsonFormat; | ||
| import com.fasterxml.jackson.databind.annotation.JsonDeserialize; | ||
| import com.fasterxml.jackson.databind.annotation.JsonSerialize; | ||
| import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; | ||
| import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; | ||
| import lombok.*; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.time.LocalDate; | ||
|
|
||
| @Getter | ||
| @Builder | ||
| @AllArgsConstructor | ||
| @NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
| public class Meal implements Serializable { | ||
|
|
||
| private boolean exists; | ||
|
|
||
| @JsonDeserialize(using = LocalDateDeserializer.class) | ||
| @JsonSerialize(using = LocalDateSerializer.class) | ||
| @JsonFormat(pattern = "yyyy-MM-dd") | ||
| private LocalDate date; | ||
|
|
||
| private Food breakfast; | ||
|
|
||
| private Food lunch; | ||
|
|
||
| private Food dinner; | ||
|
|
||
| public void setBreakfast(Food breakfast) { | ||
| this.breakfast = breakfast; | ||
| } | ||
| public void setLunch(Food lunch) { | ||
| this.lunch = lunch; | ||
| } | ||
| public void setDinner(Food dinner) { | ||
| this.dinner = dinner; | ||
| } | ||
|
|
||
| } | ||
| //package com.dear.domain.food.enums; | ||
| // | ||
| // | ||
| //import com.fasterxml.jackson.annotation.JsonFormat; | ||
| //import com.fasterxml.jackson.databind.annotation.JsonDeserialize; | ||
| //import com.fasterxml.jackson.databind.annotation.JsonSerialize; | ||
| //import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer; | ||
| //import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; | ||
| //import lombok.*; | ||
| // | ||
| //import java.io.Serializable; | ||
| //import java.time.LocalDate; | ||
| // | ||
| //@Getter | ||
| //@Builder | ||
| //@AllArgsConstructor | ||
| //@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
| //public class Meal implements Serializable { | ||
| // | ||
| // private boolean exists; | ||
| // | ||
| // @JsonDeserialize(using = LocalDateDeserializer.class) | ||
| // @JsonSerialize(using = LocalDateSerializer.class) | ||
| // @JsonFormat(pattern = "yyyy-MM-dd") | ||
| // private LocalDate date; | ||
| // | ||
| // private Food breakfast; | ||
| // | ||
| // private Food lunch; | ||
| // | ||
| // private Food dinner; | ||
| // | ||
| // public void setBreakfast(Food breakfast) { | ||
| // this.breakfast = breakfast; | ||
| // } | ||
| // public void setLunch(Food lunch) { | ||
| // this.lunch = lunch; | ||
| // } | ||
| // public void setDinner(Food dinner) { | ||
| // this.dinner = dinner; | ||
| // } | ||
| // | ||
| //} |
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