Homework lesson 06

gkislin@yandex.ru · gkislin@yandex.ru · commit 07cdca8ebc6f · 2015-04-10T20:22:13.000+03:00
diff --git a/src/main/java/ru/javawebinar/topjava/model/User.java b/src/main/java/ru/javawebinar/topjava/model/User.java
@@ -43,7 +43,8 @@ public class User extends NamedEntity {
     protected boolean enabled = true;
 
     @Column(name = "registered", columnDefinition = "timestamp default now()")
-    protected Date registered;
+    @NotEmpty
+    protected Date registered = new Date();
 
     @Enumerated(EnumType.STRING)
     @CollectionTable(name = "user_roles", joinColumns = @JoinColumn(name = "user_id"))
diff --git a/src/main/java/ru/javawebinar/topjava/repository/jdbc/JdbcUserRepositoryImpl.java b/src/main/java/ru/javawebinar/topjava/repository/jdbc/JdbcUserRepositoryImpl.java
@@ -54,7 +54,7 @@ public User save(User user) {
         } else {
             namedParameterJdbcTemplate.update(
                     "UPDATE users SET name=:name, email=:email, password=:password, " +
-                            "registered=:registered, enabled=:enabled WHERE id=:id", map);
+                            "enabled=:enabled WHERE id=:id", map);
         }
         return user;
     }
diff --git a/src/main/java/ru/javawebinar/topjava/web/meal/UserMealController.java b/src/main/java/ru/javawebinar/topjava/web/meal/UserMealController.java
@@ -0,0 +1,25 @@
+package ru.javawebinar.topjava.web.meal;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import ru.javawebinar.topjava.LoggedUser;
+import ru.javawebinar.topjava.service.UserMealService;
+
+/**
+ * User: gkislin
+ * Date: 22.08.2014
+ */
+@Controller
+public class UserMealController {
+    @Autowired
+    private UserMealService service;
+
+    @RequestMapping(value = "/meals", method = RequestMethod.GET)
+    public String mealList(Model model) {
+        model.addAttribute("mealList", service.getAll(LoggedUser.id()));
+        return "mealList";
+    }
+}
diff --git a/src/main/resources/db/initDB.sql b/src/main/resources/db/initDB.sql
@@ -11,7 +11,7 @@ CREATE TABLE users
   name       VARCHAR,
   email      VARCHAR NOT NULL,
   password   VARCHAR NOT NULL,
-  registered TIMESTAMP           DEFAULT now(),
+  registered TIMESTAMP NOT NULL DEFAULT now(),
   enabled    BOOL                DEFAULT TRUE
 );
 CREATE UNIQUE INDEX unique_email ON USERS (email);
diff --git a/src/test/java/ru/javawebinar/topjava/UserTestData.java b/src/test/java/ru/javawebinar/topjava/UserTestData.java
@@ -15,8 +15,6 @@
  */
 public class UserTestData {
 
-    private static final LoggerWrapper LOG = LoggerWrapper.get(UserTestData.class);
-
     public static final TestUser USER = new TestUser(BaseEntity.START_SEQ, "User", "user@yandex.ru", "password", true, Role.ROLE_USER);
     public static final User ADMIN = new TestUser(BaseEntity.START_SEQ + 1, "Admin", "admin@gmail.com", "admin", true, Role.ROLE_ADMIN);
 
diff --git a/src/test/java/ru/javawebinar/topjava/service/DbTest.java b/src/test/java/ru/javawebinar/topjava/service/DbTest.java
@@ -7,7 +7,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import ru.javawebinar.topjava.repository.JpaUtil;
 import ru.javawebinar.topjava.util.DbPopulator;
 
 /**
@@ -24,9 +23,6 @@ abstract public class DbTest {
     @Rule
     public ExpectedException thrown = ExpectedException.none();
 
-    @Autowired
-    private JpaUtil jpaUtil;
-
     @Autowired
     private DbPopulator dbPopulator;
 
@@ -37,6 +33,5 @@ abstract public class DbTest {
     public void setUp() throws Exception {
         dbPopulator.execute();
         userService.evictCache();
-        jpaUtil.clear2ndLevelHibernateCache();
     }
 }
diff --git a/src/test/java/ru/javawebinar/topjava/service/OrmUserServiceTest.java b/src/test/java/ru/javawebinar/topjava/service/OrmUserServiceTest.java
@@ -0,0 +1,20 @@
+package ru.javawebinar.topjava.service;
+
+import org.junit.Before;
+import org.springframework.beans.factory.annotation.Autowired;
+import ru.javawebinar.topjava.repository.JpaUtil;
+
+/**
+ * GKislin
+ * 07.04.2015.
+ */
+abstract public class OrmUserServiceTest extends UserServiceTest {
+    @Autowired
+    private JpaUtil jpaUtil;
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        jpaUtil.clear2ndLevelHibernateCache();
+    }
+}
diff --git a/src/test/java/ru/javawebinar/topjava/service/UserServiceTest.java b/src/test/java/ru/javawebinar/topjava/service/UserServiceTest.java
@@ -1,14 +1,11 @@
 package ru.javawebinar.topjava.service;
 
-import org.junit.Before;
 import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import ru.javawebinar.topjava.UserTestData.*;
 import ru.javawebinar.topjava.model.BaseEntity;
 import ru.javawebinar.topjava.model.Role;
 import ru.javawebinar.topjava.model.User;
-import ru.javawebinar.topjava.util.DbPopulator;
 import ru.javawebinar.topjava.util.exception.NotFoundException;
 
 import java.util.Arrays;
@@ -19,15 +16,6 @@
 
 abstract public class UserServiceTest extends DbTest {
 
-    @Autowired
-    private DbPopulator dbPopulator;
-
-    @Before
-    public void setUp() throws Exception {
-        dbPopulator.execute();
-        userService.evictCache();
-    }
-
     @Test
     public void testSave() throws Exception {
         TestUser tu = new TestUser("New", "new@gmail.com", "newPass", Role.ROLE_USER);
diff --git a/src/test/java/ru/javawebinar/topjava/service/datajpa/DataJpaUserServiceTest.java b/src/test/java/ru/javawebinar/topjava/service/datajpa/DataJpaUserServiceTest.java
@@ -1,11 +1,11 @@
 package ru.javawebinar.topjava.service.datajpa;
 
 import org.springframework.test.context.ActiveProfiles;
-import ru.javawebinar.topjava.service.UserServiceTest;
+import ru.javawebinar.topjava.service.OrmUserServiceTest;
 
 import static ru.javawebinar.topjava.Profiles.DATAJPA;
 import static ru.javawebinar.topjava.Profiles.POSTGRES;
 
 @ActiveProfiles({POSTGRES, DATAJPA})
-public class DataJpaUserServiceTest extends UserServiceTest {
+public class DataJpaUserServiceTest extends OrmUserServiceTest {
 }
diff --git a/src/test/java/ru/javawebinar/topjava/service/jpa/JpaUserServiceTest.java b/src/test/java/ru/javawebinar/topjava/service/jpa/JpaUserServiceTest.java
@@ -1,11 +1,11 @@
 package ru.javawebinar.topjava.service.jpa;
 
 import org.springframework.test.context.ActiveProfiles;
-import ru.javawebinar.topjava.service.UserServiceTest;
+import ru.javawebinar.topjava.service.OrmUserServiceTest;
 
 import static ru.javawebinar.topjava.Profiles.JPA;
 import static ru.javawebinar.topjava.Profiles.POSTGRES;
 
 @ActiveProfiles({POSTGRES, JPA})
-public class JpaUserServiceTest extends UserServiceTest {
+public class JpaUserServiceTest extends OrmUserServiceTest {
 }
diff --git a/src/test/java/ru/javawebinar/topjava/web/mock/UserAdminMockTest.java b/src/test/java/ru/javawebinar/topjava/web/mock/UserAdminMockTest.java
@@ -18,7 +18,7 @@ public class UserAdminMockTest {
 
     @BeforeClass
     public static void beforeClass() {
-        appCtx = new ClassPathXmlApplicationContext("spring/spring-app.xml", "spring/mock.xml");
+        appCtx = new ClassPathXmlApplicationContext("spring/spring-mvc.xml", "spring/spring-app.xml", "spring/mock.xml");
         System.out.println("\n" + Arrays.toString(appCtx.getBeanDefinitionNames()) + "\n");
         controller = appCtx.getBean(AdminUserRestController.class);
     }
diff --git a/src/test/java/ru/javawebinar/topjava/web/mock/UserAdminSpringMockTest.java b/src/test/java/ru/javawebinar/topjava/web/mock/UserAdminSpringMockTest.java
@@ -14,7 +14,7 @@
  * GKislin
  * 13.03.2015.
  */
-@ContextConfiguration({"classpath:spring/spring-app.xml", "classpath:spring/mock.xml"})
+@ContextConfiguration({"classpath:spring/spring-mvc.xml", "classpath:spring/spring-app.xml", "classpath:spring/mock.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 public class UserAdminSpringMockTest {
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public User save(User user) {`
`54`	`54`	`} else {`
`55`	`55`	`namedParameterJdbcTemplate.update(`
`56`	`56`	`"UPDATE users SET name=:name, email=:email, password=:password, " +`
`57`		`- "registered=:registered, enabled=:enabled WHERE id=:id", map);`
	`57`	`+ "enabled=:enabled WHERE id=:id", map);`
`58`	`58`	`}`
`59`	`59`	`return user;`
`60`	`60`	`}`