From 32590ace59ec09aa87018d5c1ee8269c22d45821 Mon Sep 17 00:00:00 2001
From: andzh <andzheykoba@gmail.com>
Date: Fri, 14 Jul 2017 09:41:53 +0300
Subject: [PATCH 1/8] 1_0_fix

---
 .gitignore                                    |  4 +--
 .../java/ru/javawebinar/topjava/Main.java     |  7 ++--
 .../model/{UserMeal.java => Meal.java}        |  8 ++---
 ...ealWithExceed.java => MealWithExceed.java} |  8 ++---
 .../javawebinar/topjava/util/MealsUtil.java   | 31 ++++++++++++++++
 .../topjava/util/UserMealsUtil.java           | 35 -------------------
 6 files changed, 38 insertions(+), 55 deletions(-)
 rename src/main/java/ru/javawebinar/topjava/model/{UserMeal.java => Meal.java} (78%)
 rename src/main/java/ru/javawebinar/topjava/model/{UserMealWithExceed.java => MealWithExceed.java} (67%)
 create mode 100644 src/main/java/ru/javawebinar/topjava/util/MealsUtil.java
 delete mode 100644 src/main/java/ru/javawebinar/topjava/util/UserMealsUtil.java

diff --git a/.gitignore b/.gitignore
index 928d676..1275579 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,5 @@ out
 target
 *.iml
 log
-
-
-
+*.patch
 patches/
diff --git a/src/main/java/ru/javawebinar/topjava/Main.java b/src/main/java/ru/javawebinar/topjava/Main.java
index b23a2f0..cb7e35a 100644
--- a/src/main/java/ru/javawebinar/topjava/Main.java
+++ b/src/main/java/ru/javawebinar/topjava/Main.java
@@ -1,11 +1,8 @@
 package ru.javawebinar.topjava;
 
 /**
- * User: gkislin
- * Date: 05.08.2015
- *
- * @link http://caloriesmng.herokuapp.com/
- * @link https://github.com/JavaOPs/topjava
+ * @see <a href="http://topjava.herokuapp.com">Demo</a>
+ * @see <a href="https://github.com/JavaOPs/topjava">Initial project</a>
  */
 public class Main {
     public static void main(String[] args) {
diff --git a/src/main/java/ru/javawebinar/topjava/model/UserMeal.java b/src/main/java/ru/javawebinar/topjava/model/Meal.java
similarity index 78%
rename from src/main/java/ru/javawebinar/topjava/model/UserMeal.java
rename to src/main/java/ru/javawebinar/topjava/model/Meal.java
index aec9beb..f546cef 100644
--- a/src/main/java/ru/javawebinar/topjava/model/UserMeal.java
+++ b/src/main/java/ru/javawebinar/topjava/model/Meal.java
@@ -2,18 +2,14 @@
 
 import java.time.LocalDateTime;
 
-/**
- * GKislin
- * 11.01.2015.
- */
-public class UserMeal {
+public class Meal {
     private final LocalDateTime dateTime;
 
     private final String description;
 
     private final int calories;
 
-    public UserMeal(LocalDateTime dateTime, String description, int calories) {
+    public Meal(LocalDateTime dateTime, String description, int calories) {
         this.dateTime = dateTime;
         this.description = description;
         this.calories = calories;
diff --git a/src/main/java/ru/javawebinar/topjava/model/UserMealWithExceed.java b/src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java
similarity index 67%
rename from src/main/java/ru/javawebinar/topjava/model/UserMealWithExceed.java
rename to src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java
index f4f880e..c8e0d71 100644
--- a/src/main/java/ru/javawebinar/topjava/model/UserMealWithExceed.java
+++ b/src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java
@@ -2,11 +2,7 @@
 
 import java.time.LocalDateTime;
 
-/**
- * GKislin
- * 11.01.2015.
- */
-public class UserMealWithExceed {
+public class MealWithExceed {
     private final LocalDateTime dateTime;
 
     private final String description;
@@ -15,7 +11,7 @@ public class UserMealWithExceed {
 
     private final boolean exceed;
 
-    public UserMealWithExceed(LocalDateTime dateTime, String description, int calories, boolean exceed) {
+    public MealWithExceed(LocalDateTime dateTime, String description, int calories, boolean exceed) {
         this.dateTime = dateTime;
         this.description = description;
         this.calories = calories;
diff --git a/src/main/java/ru/javawebinar/topjava/util/MealsUtil.java b/src/main/java/ru/javawebinar/topjava/util/MealsUtil.java
new file mode 100644
index 0000000..a1bb183
--- /dev/null
+++ b/src/main/java/ru/javawebinar/topjava/util/MealsUtil.java
@@ -0,0 +1,31 @@
+package ru.javawebinar.topjava.util;
+
+import ru.javawebinar.topjava.model.Meal;
+import ru.javawebinar.topjava.model.MealWithExceed;
+
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.Month;
+import java.util.Arrays;
+import java.util.List;
+
+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)
+        );
+        getFilteredWithExceeded(mealList, LocalTime.of(7, 0), LocalTime.of(12,0), 2000);
+//        .toLocalDate();
+//        .toLocalTime();
+    }
+
+    public static List<MealWithExceed>  getFilteredWithExceeded(List<Meal> mealList, LocalTime startTime, LocalTime endTime, int caloriesPerDay) {
+        // TODO return filtered list with correctly exceeded field
+        return null;
+    }
+}
diff --git a/src/main/java/ru/javawebinar/topjava/util/UserMealsUtil.java b/src/main/java/ru/javawebinar/topjava/util/UserMealsUtil.java
deleted file mode 100644
index 8c5f1dc..0000000
--- a/src/main/java/ru/javawebinar/topjava/util/UserMealsUtil.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package ru.javawebinar.topjava.util;
-
-import ru.javawebinar.topjava.model.UserMeal;
-import ru.javawebinar.topjava.model.UserMealWithExceed;
-
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.Month;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * GKislin
- * 31.05.2015.
- */
-public class UserMealsUtil {
-    public static void main(String[] args) {
-        List<UserMeal> mealList = Arrays.asList(
-                new UserMeal(LocalDateTime.of(2015, Month.MAY, 30,10,0), "Завтрак", 500),
-                new UserMeal(LocalDateTime.of(2015, Month.MAY, 30,13,0), "Обед", 1000),
-                new UserMeal(LocalDateTime.of(2015, Month.MAY, 30,20,0), "Ужин", 500),
-                new UserMeal(LocalDateTime.of(2015, Month.MAY, 31,10,0), "Завтрак", 1000),
-                new UserMeal(LocalDateTime.of(2015, Month.MAY, 31,13,0), "Обед", 500),
-                new UserMeal(LocalDateTime.of(2015, Month.MAY, 31,20,0), "Ужин", 510)
-        );
-        getFilteredWithExceeded(mealList, LocalTime.of(7, 0), LocalTime.of(12,0), 2000);
-//        .toLocalDate();
-//        .toLocalTime();
-    }
-
-    public static List<UserMealWithExceed>  getFilteredWithExceeded(List<UserMeal> mealList, LocalTime startTime, LocalTime endTime, int caloriesPerDay) {
-        // TODO return filtered list with correctly exceeded field
-        return null;
-    }
-}

From e875fdd0909fbdbd3d743796eb61c237f1305c6c Mon Sep 17 00:00:00 2001
From: andzh <andzheykoba@gmail.com>
Date: Fri, 14 Jul 2017 09:44:51 +0300
Subject: [PATCH 2/8] 1_1_HW0_stream

---
 .../ru/javawebinar/topjava/model/Meal.java    | 10 +++++
 .../topjava/model/MealWithExceed.java         | 12 +++++-
 .../javawebinar/topjava/util/MealsUtil.java   | 40 ++++++++++++-------
 3 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/src/main/java/ru/javawebinar/topjava/model/Meal.java b/src/main/java/ru/javawebinar/topjava/model/Meal.java
index f546cef..943ff5c 100644
--- a/src/main/java/ru/javawebinar/topjava/model/Meal.java
+++ b/src/main/java/ru/javawebinar/topjava/model/Meal.java
@@ -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 String getDescription() {
     public int getCalories() {
         return calories;
     }
+
+    public LocalDate getDate() {
+        return dateTime.toLocalDate();
+    }
+
+    public LocalTime getTime() {
+        return dateTime.toLocalTime();
+    }
 }
diff --git a/src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java b/src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java
index c8e0d71..4751c9e 100644
--- a/src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java
+++ b/src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java
@@ -17,4 +17,14 @@ public MealWithExceed(LocalDateTime dateTime, String description, int calories,
         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
diff --git a/src/main/java/ru/javawebinar/topjava/util/MealsUtil.java b/src/main/java/ru/javawebinar/topjava/util/MealsUtil.java
index a1bb183..2143f7f 100644
--- a/src/main/java/ru/javawebinar/topjava/util/MealsUtil.java
+++ b/src/main/java/ru/javawebinar/topjava/util/MealsUtil.java
@@ -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

From cb267384b8aee7691420d221af6409813b78d828 Mon Sep 17 00:00:00 2001
From: andzh <andzheykoba@gmail.com>
Date: Fri, 14 Jul 2017 09:47:05 +0300
Subject: [PATCH 3/8] 1_2_HW0_cycle

---
 .../javawebinar/topjava/util/MealsUtil.java   | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/main/java/ru/javawebinar/topjava/util/MealsUtil.java b/src/main/java/ru/javawebinar/topjava/util/MealsUtil.java
index 2143f7f..2ef2768 100644
--- a/src/main/java/ru/javawebinar/topjava/util/MealsUtil.java
+++ b/src/main/java/ru/javawebinar/topjava/util/MealsUtil.java
@@ -7,9 +7,7 @@
 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.*;
 import java.util.stream.Collectors;
 
 public class MealsUtil {
@@ -24,6 +22,8 @@ public static void main(String[] args) {
         );
         List<MealWithExceed> mealsWithExceeded = getFilteredWithExceeded(meals, LocalTime.of(7, 0), LocalTime.of(12, 0), 2000);
         mealsWithExceeded.forEach(System.out::println);
+
+        System.out.println(getFilteredWithExceededByCycle(meals, LocalTime.of(7, 0), LocalTime.of(12, 0), 2000));
     }
 
     public static List<MealWithExceed> getFilteredWithExceeded(List<Meal> meals, LocalTime startTime, LocalTime endTime, int caloriesPerDay) {
@@ -35,9 +35,25 @@ public static List<MealWithExceed> getFilteredWithExceeded(List<Meal> meals, Loc
 
         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))
+                .map(meal -> createWithExceed(meal, caloriesSumByDate.get(meal.getDate()) > caloriesPerDay))
                 .collect(Collectors.toList());
     }
+
+    public static List<MealWithExceed> getFilteredWithExceededByCycle(List<Meal> meals, LocalTime startTime, LocalTime endTime, int caloriesPerDay) {
+
+        final Map<LocalDate, Integer> caloriesSumByDate = new HashMap<>();
+        meals.forEach(meal -> caloriesSumByDate.merge(meal.getDate(), meal.getCalories(), Integer::sum));
+
+        final List<MealWithExceed> mealsWithExceeded = new ArrayList<>();
+        meals.forEach(meal -> {
+            if (TimeUtil.isBetween(meal.getTime(), startTime, endTime)) {
+                mealsWithExceeded.add(createWithExceed(meal, caloriesSumByDate.get(meal.getDate()) > caloriesPerDay));
+            }
+        });
+        return mealsWithExceeded;
+    }
+
+    public static MealWithExceed createWithExceed(Meal meal, boolean exceeded) {
+        return new MealWithExceed(meal.getDateTime(), meal.getDescription(), meal.getCalories(), exceeded);
+    }
 }
\ No newline at end of file

From 10095dd6e97e36c405fd9cfc7c2f64bccfb4f3e9 Mon Sep 17 00:00:00 2001
From: andzh <andzheykoba@gmail.com>
Date: Fri, 14 Jul 2017 09:48:49 +0300
Subject: [PATCH 4/8] 1_3_switch_to_war

---
 pom.xml                         |  2 +-
 src/main/webapp/WEB-INF/web.xml | 19 +++++++++++++++++++
 src/main/webapp/index.html      | 13 +++++++++++++
 src/main/webapp/users.jsp       | 10 ++++++++++
 4 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 src/main/webapp/WEB-INF/web.xml
 create mode 100644 src/main/webapp/index.html
 create mode 100644 src/main/webapp/users.jsp

diff --git a/pom.xml b/pom.xml
index c8a1c78..6f0e7fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>ru.javawebinar</groupId>
     <artifactId>topjava</artifactId>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
 
     <version>1.0-SNAPSHOT</version>
 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..1c91ffe
--- /dev/null
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,19 @@
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+		 http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+
+    <display-name>Topjava</display-name>
+
+    <servlet>
+        <servlet-name>userServlet</servlet-name>
+        <servlet-class>ru.javawebinar.topjava.web.UserServlet</servlet-class>
+        <load-on-startup>0</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>userServlet</servlet-name>
+        <url-pattern>/users</url-pattern>
+    </servlet-mapping>
+
+</web-app>
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
new file mode 100644
index 0000000..6253517
--- /dev/null
+++ b/src/main/webapp/index.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>Java Enterprise (Topjava)</title>
+</head>
+<body>
+<h3>Проект <a href="https://github.com/JavaWebinar/topjava" target="_blank">Java Enterprise (Topjava)</a></h3>
+<hr>
+<ul>
+    <li><a href="users">Users</a></li>
+</ul>
+</body>
+</html>
diff --git a/src/main/webapp/users.jsp b/src/main/webapp/users.jsp
new file mode 100644
index 0000000..acf19d7
--- /dev/null
+++ b/src/main/webapp/users.jsp
@@ -0,0 +1,10 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Users</title>
+</head>
+<body>
+<h3><a href="index.html">Home</a></h3>
+<h2>Users</h2>
+</body>
+</html>
\ No newline at end of file

From 1f5890d5aac2269d21883f339226f221132c77bf Mon Sep 17 00:00:00 2001
From: andzh <andzheykoba@gmail.com>
Date: Fri, 14 Jul 2017 10:22:43 +0300
Subject: [PATCH 5/8] 1_4_add_servlet_api

---
 pom.xml                                           |  8 ++++++++
 .../ru/javawebinar/topjava/web/UserServlet.java   | 15 +++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 src/main/java/ru/javawebinar/topjava/web/UserServlet.java

diff --git a/pom.xml b/pom.xml
index 6f0e7fd..1eae3f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,14 @@
     </build>
 
     <dependencies>
+
+        <!--Web-->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/src/main/java/ru/javawebinar/topjava/web/UserServlet.java b/src/main/java/ru/javawebinar/topjava/web/UserServlet.java
new file mode 100644
index 0000000..76056e0
--- /dev/null
+++ b/src/main/java/ru/javawebinar/topjava/web/UserServlet.java
@@ -0,0 +1,15 @@
+package ru.javawebinar.topjava.web;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class UserServlet extends HttpServlet {
+
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        request.getRequestDispatcher("/users.jsp").forward(request, response);
+    }
+}

From 954d5954d19e598004fe7257fc3b5c0dc1ad8438 Mon Sep 17 00:00:00 2001
From: andzh <andzheykoba@gmail.com>
Date: Fri, 14 Jul 2017 10:24:30 +0300
Subject: [PATCH 6/8] 1_5_forward_to_redirect

---
 pom.xml                                                   | 2 +-
 src/main/java/ru/javawebinar/topjava/web/UserServlet.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1eae3f7..6199133 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 
     <build>
         <finalName>topjava</finalName>
-        <defaultGoal>install</defaultGoal>
+        <defaultGoal>package</defaultGoal>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/ru/javawebinar/topjava/web/UserServlet.java b/src/main/java/ru/javawebinar/topjava/web/UserServlet.java
index 76056e0..11f282b 100644
--- a/src/main/java/ru/javawebinar/topjava/web/UserServlet.java
+++ b/src/main/java/ru/javawebinar/topjava/web/UserServlet.java
@@ -10,6 +10,7 @@ public class UserServlet extends HttpServlet {
 
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-        request.getRequestDispatcher("/users.jsp").forward(request, response);
+//        request.getRequestDispatcher("/users.jsp").forward(request, response);
+        response.sendRedirect("users.jsp");
     }
 }

From a554657bdd52c775825df31cd1473762c8e238cf Mon Sep 17 00:00:00 2001
From: andzh <andzheykoba@gmail.com>
Date: Fri, 14 Jul 2017 11:24:07 +0300
Subject: [PATCH 7/8] 1_6_logging

---
 pom.xml                                       | 25 ++++++++++++++++
 .../javawebinar/topjava/web/UserServlet.java  |  7 +++++
 src/main/resources/logback.xml                | 29 +++++++++++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 src/main/resources/logback.xml

diff --git a/pom.xml b/pom.xml
index 6199133..167219c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,10 @@
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+        <!-- Logging -->
+        <logback.version>1.2.3</logback.version>
+        <slf4j.version>1.7.25</slf4j.version>
     </properties>
 
     <build>
@@ -34,6 +38,27 @@
     </build>
 
     <dependencies>
+        <!-- Logging with SLF4J & LogBack -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+            <scope>runtime</scope>
+        </dependency>
 
         <!--Web-->
         <dependency>
diff --git a/src/main/java/ru/javawebinar/topjava/web/UserServlet.java b/src/main/java/ru/javawebinar/topjava/web/UserServlet.java
index 11f282b..ef52d67 100644
--- a/src/main/java/ru/javawebinar/topjava/web/UserServlet.java
+++ b/src/main/java/ru/javawebinar/topjava/web/UserServlet.java
@@ -1,15 +1,22 @@
 package ru.javawebinar.topjava.web;
 
+import org.slf4j.Logger;
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
 public class UserServlet extends HttpServlet {
+    private static final Logger log = getLogger(UserServlet.class);
 
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        log.debug("redirect to users");
+
 //        request.getRequestDispatcher("/users.jsp").forward(request, response);
         response.sendRedirect("users.jsp");
     }
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
new file mode 100644
index 0000000..e9b900b
--- /dev/null
+++ b/src/main/resources/logback.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="30 seconds">
+
+    <!-- To enable JMX Management -->
+    <jmxConfigurator/>
+
+    <appender name="file" class="ch.qos.logback.core.FileAppender">
+        <file>${TOPJAVA_ROOT}/log/topjava.log</file>
+
+        <encoder>
+            <charset>UTF-8</charset>
+            <pattern>%date %-5level %logger{0} [%file:%line] %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <charset>UTF-8</charset>
+            <pattern>%-5level %logger{0} [%file:%line] %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="ru.javawebinar.topjava" level="debug"/>
+
+    <root level="info">
+        <appender-ref ref="file"/>
+        <appender-ref ref="console"/>
+    </root>
+</configuration>

From fb508c609a6cacec7a74ca017488ef92656f9c9b Mon Sep 17 00:00:00 2001
From: andzh <andzheykoba@gmail.com>
Date: Wed, 19 Jul 2017 22:02:54 +0300
Subject: [PATCH 8/8] HW01

---
 pom.xml                                       |  6 +++
 .../javawebinar/topjava/Repo/MealsRepo.java   | 29 +++++++++++++
 .../topjava/model/MealWithExceed.java         | 16 +++++++
 .../javawebinar/topjava/util/MealsUtil.java   | 24 ++++++-----
 .../ru/javawebinar/topjava/util/TimeUtil.java |  9 ++++
 .../javawebinar/topjava/web/MealServlet.java  | 26 ++++++++++++
 src/main/webapp/WEB-INF/web.xml               | 10 +++++
 src/main/webapp/index.html                    |  1 +
 src/main/webapp/meals.jsp                     | 42 +++++++++++++++++++
 9 files changed, 153 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/ru/javawebinar/topjava/Repo/MealsRepo.java
 create mode 100644 src/main/java/ru/javawebinar/topjava/web/MealServlet.java
 create mode 100644 src/main/webapp/meals.jsp

diff --git a/pom.xml b/pom.xml
index 167219c..d56f77e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,12 @@
             <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/src/main/java/ru/javawebinar/topjava/Repo/MealsRepo.java b/src/main/java/ru/javawebinar/topjava/Repo/MealsRepo.java
new file mode 100644
index 0000000..80c4240
--- /dev/null
+++ b/src/main/java/ru/javawebinar/topjava/Repo/MealsRepo.java
@@ -0,0 +1,29 @@
+package ru.javawebinar.topjava.Repo;
+
+import ru.javawebinar.topjava.model.Meal;
+import ru.javawebinar.topjava.model.MealWithExceed;
+
+import java.time.LocalDateTime;
+import java.time.Month;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class MealsRepo {
+    private static 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)
+    );
+
+    public static List<Meal> getMeals() {
+        return meals;
+    }
+
+    public static void setMeals(List<Meal> meals) {
+        MealsRepo.meals = meals;
+    }
+}
diff --git a/src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java b/src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java
index 4751c9e..3f39368 100644
--- a/src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java
+++ b/src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java
@@ -9,6 +9,22 @@ public class MealWithExceed {
 
     private final int calories;
 
+    public LocalDateTime getDateTime() {
+        return dateTime;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public int getCalories() {
+        return calories;
+    }
+
+    public boolean isExceed() {
+        return exceed;
+    }
+
     private final boolean exceed;
 
     public MealWithExceed(LocalDateTime dateTime, String description, int calories, boolean exceed) {
diff --git a/src/main/java/ru/javawebinar/topjava/util/MealsUtil.java b/src/main/java/ru/javawebinar/topjava/util/MealsUtil.java
index 2ef2768..5cbc755 100644
--- a/src/main/java/ru/javawebinar/topjava/util/MealsUtil.java
+++ b/src/main/java/ru/javawebinar/topjava/util/MealsUtil.java
@@ -11,19 +11,23 @@
 import java.util.stream.Collectors;
 
 public class MealsUtil {
+    public static final 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)
+    );
     public static void main(String[] args) {
-        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)
-        );
-        List<MealWithExceed> mealsWithExceeded = getFilteredWithExceeded(meals, LocalTime.of(7, 0), LocalTime.of(12, 0), 2000);
+        List<MealWithExceed> mealsWithExceeded = getFilteredWithExceeded(MEALS, LocalTime.of(7, 0), LocalTime.of(12, 0), 2000);
         mealsWithExceeded.forEach(System.out::println);
 
-        System.out.println(getFilteredWithExceededByCycle(meals, LocalTime.of(7, 0), LocalTime.of(12, 0), 2000));
+        System.out.println(getFilteredWithExceededByCycle(MEALS, LocalTime.of(7, 0), LocalTime.of(12, 0), 2000));
+    }
+
+    public static List<MealWithExceed> mealWithExceeds(List<Meal> meals, int calories) {
+        return getFilteredWithExceeded(meals, LocalTime.MIN, LocalTime.MAX, calories);
     }
 
     public static List<MealWithExceed> getFilteredWithExceeded(List<Meal> meals, LocalTime startTime, LocalTime endTime, int caloriesPerDay) {
diff --git a/src/main/java/ru/javawebinar/topjava/util/TimeUtil.java b/src/main/java/ru/javawebinar/topjava/util/TimeUtil.java
index 02399b7..7a5c5a7 100644
--- a/src/main/java/ru/javawebinar/topjava/util/TimeUtil.java
+++ b/src/main/java/ru/javawebinar/topjava/util/TimeUtil.java
@@ -1,13 +1,22 @@
 package ru.javawebinar.topjava.util;
 
+import java.time.DateTimeException;
+import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 
 /**
  * GKislin
  * 07.01.2015.
  */
 public class TimeUtil {
+    public static DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
     public static boolean isBetween(LocalTime lt, LocalTime startTime, LocalTime endTime) {
         return lt.compareTo(startTime) >= 0 && lt.compareTo(endTime) <= 0;
     }
+
+    public static String toString(LocalDateTime localDateTime) {
+        return localDateTime == null ? "" : localDateTime.format(FORMATTER);
+    }
+
 }
diff --git a/src/main/java/ru/javawebinar/topjava/web/MealServlet.java b/src/main/java/ru/javawebinar/topjava/web/MealServlet.java
new file mode 100644
index 0000000..a24c691
--- /dev/null
+++ b/src/main/java/ru/javawebinar/topjava/web/MealServlet.java
@@ -0,0 +1,26 @@
+package ru.javawebinar.topjava.web;
+
+import org.slf4j.Logger;
+import ru.javawebinar.topjava.Repo.MealsRepo;
+import ru.javawebinar.topjava.util.MealsUtil;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+public class MealServlet extends HttpServlet {
+    private static final Logger log = getLogger(MealServlet.class);
+
+    MealsRepo mealsRepo = new MealsRepo();
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        log.debug("redirect to meals");
+//        response.sendRedirect("meals.jsp");
+        request.setAttribute("mealList", MealsUtil.mealWithExceeds(MealsUtil.MEALS, 2000));
+        request.getRequestDispatcher("/meals.jsp").forward(request,response);
+    }
+}
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 1c91ffe..d2e4755 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -16,4 +16,14 @@
         <url-pattern>/users</url-pattern>
     </servlet-mapping>
 
+    <servlet>
+        <servlet-name>mealServlet</servlet-name>
+        <servlet-class>ru.javawebinar.topjava.web.MealServlet</servlet-class>
+        <load-on-startup>0</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>mealServlet</servlet-name>
+        <url-pattern>/meals</url-pattern>
+    </servlet-mapping>
+
 </web-app>
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index 6253517..70307bc 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -8,6 +8,7 @@ <h3>Проект <a href="https://github.com/JavaWebinar/topjava" target="_blank
 <hr>
 <ul>
     <li><a href="users">Users</a></li>
+    <li><a href="meals">Meal</a></li>
 </ul>
 </body>
 </html>
diff --git a/src/main/webapp/meals.jsp b/src/main/webapp/meals.jsp
new file mode 100644
index 0000000..ba93078
--- /dev/null
+++ b/src/main/webapp/meals.jsp
@@ -0,0 +1,42 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ page import="ru.javawebinar.topjava.util.TimeUtil" %>
+<html>
+<head>
+    <title>Meal</title>
+    <style>
+        .normal{color: green}
+        .exceeded{color: red}
+    </style>
+</head>
+<body>
+<h3><a href="index.html">Home</a></h3>
+<h2>Meal</h2>
+<table border="1">
+    <thead>
+        <tr>
+            <th>Дата\Время</th>
+            <th>Описание</th>
+            <th>Калории</th>
+            <%--<th>Удалить</th>--%>
+            <%--<th>Изменить</th>--%>
+        </tr>
+    </thead>
+    <tbody>
+    <c:forEach items="${mealList}" var="meal">
+        <jsp:useBean id="meal" scope="page" type="ru.javawebinar.topjava.model.MealWithExceed"/>
+        <tr class="${meal.exceed ? 'exceeded':'normal'}">
+        <td>
+            <%=TimeUtil.toString(meal.getDateTime())%>
+        </td>
+            <td>${meal.description}</td>
+            <td>${meal.calories}</td>
+            </tr>
+       </c:forEach>
+
+    </tbody>
+
+</table>
+</body>
+</html>
\ No newline at end of file