forked from JavaOPs/topjava
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path1_1_HW0_stream.patch
More file actions
116 lines (111 loc) · 5.01 KB
/
1_1_HW0_stream.patch
File metadata and controls
116 lines (111 loc) · 5.01 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
Index: src/main/java/ru/javawebinar/topjava/util/MealsUtil.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ru/javawebinar/topjava/util/MealsUtil.java (date 1530137394000)
+++ src/main/java/ru/javawebinar/topjava/util/MealsUtil.java (date 1530137413670)
@@ -3,29 +3,41 @@
import ru.javawebinar.topjava.model.Meal;
import ru.javawebinar.topjava.model.MealWithExceed;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.Month;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
public class MealsUtil {
public static void main(String[] args) {
- List<Meal> mealList = Arrays.asList(
- new Meal(LocalDateTime.of(2015, Month.MAY, 30,10,0), "Завтрак", 500),
- new Meal(LocalDateTime.of(2015, Month.MAY, 30,13,0), "Обед", 1000),
- new Meal(LocalDateTime.of(2015, Month.MAY, 30,20,0), "Ужин", 500),
- new Meal(LocalDateTime.of(2015, Month.MAY, 31,10,0), "Завтрак", 1000),
- new Meal(LocalDateTime.of(2015, Month.MAY, 31,13,0), "Обед", 500),
- new Meal(LocalDateTime.of(2015, Month.MAY, 31,20,0), "Ужин", 510)
+ List<Meal> meals = Arrays.asList(
+ new Meal(LocalDateTime.of(2015, Month.MAY, 30, 10, 0), "Завтрак", 500),
+ new Meal(LocalDateTime.of(2015, Month.MAY, 30, 13, 0), "Обед", 1000),
+ new Meal(LocalDateTime.of(2015, Month.MAY, 30, 20, 0), "Ужин", 500),
+ new Meal(LocalDateTime.of(2015, Month.MAY, 31, 10, 0), "Завтрак", 1000),
+ new Meal(LocalDateTime.of(2015, Month.MAY, 31, 13, 0), "Обед", 500),
+ new Meal(LocalDateTime.of(2015, Month.MAY, 31, 20, 0), "Ужин", 510)
);
- getFilteredWithExceeded(mealList, LocalTime.of(7, 0), LocalTime.of(12,0), 2000);
-// .toLocalDate();
-// .toLocalTime();
+ List<MealWithExceed> mealsWithExceeded = getFilteredWithExceeded(meals, LocalTime.of(7, 0), LocalTime.of(12, 0), 2000);
+ mealsWithExceeded.forEach(System.out::println);
}
- public static List<MealWithExceed> getFilteredWithExceeded(List<Meal> mealList, LocalTime startTime, LocalTime endTime, int caloriesPerDay) {
- // TODO return filtered list with correctly exceeded field
- return null;
+ public static List<MealWithExceed> getFilteredWithExceeded(List<Meal> meals, LocalTime startTime, LocalTime endTime, int caloriesPerDay) {
+ Map<LocalDate, Integer> caloriesSumByDate = meals.stream()
+ .collect(
+ Collectors.groupingBy(Meal::getDate, Collectors.summingInt(Meal::getCalories))
+// Collectors.toMap(Meal::getDate, Meal::getCalories, Integer::sum)
+ );
+
+ return meals.stream()
+ .filter(meal -> TimeUtil.isBetween(meal.getTime(), startTime, endTime))
+ .map(meal ->
+ new MealWithExceed(meal.getDateTime(), meal.getDescription(), meal.getCalories(),
+ caloriesSumByDate.get(meal.getDate()) > caloriesPerDay))
+ .collect(Collectors.toList());
}
}
\ No newline at end of file
Index: src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java (date 1530137394000)
+++ src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java (date 1530137413609)
@@ -17,4 +17,14 @@
this.calories = calories;
this.exceed = exceed;
}
-}
+
+ @Override
+ public String toString() {
+ return "UserMealWithExceed{" +
+ "dateTime=" + dateTime +
+ ", description='" + description + '\'' +
+ ", calories=" + calories +
+ ", exceed=" + exceed +
+ '}';
+ }
+}
\ No newline at end of file
Index: src/main/java/ru/javawebinar/topjava/model/Meal.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/ru/javawebinar/topjava/model/Meal.java (date 1530137394000)
+++ src/main/java/ru/javawebinar/topjava/model/Meal.java (date 1530137413502)
@@ -1,6 +1,8 @@
package ru.javawebinar.topjava.model;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.LocalTime;
public class Meal {
private final LocalDateTime dateTime;
@@ -26,4 +28,12 @@
public int getCalories() {
return calories;
}
+
+ public LocalDate getDate() {
+ return dateTime.toLocalDate();
+ }
+
+ public LocalTime getTime() {
+ return dateTime.toLocalTime();
+ }
}