{
+
+ @Override
+ public LocalTime parse(String text, Locale locale) {
+ return parseLocalTime(text);
+ }
+
+ @Override
+ public String print(LocalTime lt, Locale locale) {
+ return lt.format(DateTimeFormatter.ISO_LOCAL_TIME);
+ }
+ }
+}
diff --git a/src/main/java/ru/javawebinar/topjava/web/json/JacksonObjectMapper.java b/src/main/java/ru/javawebinar/topjava/web/json/JacksonObjectMapper.java
new file mode 100644
index 000000000000..8237df93bffe
--- /dev/null
+++ b/src/main/java/ru/javawebinar/topjava/web/json/JacksonObjectMapper.java
@@ -0,0 +1,37 @@
+package ru.javawebinar.topjava.web.json;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
+/**
+ *
+ * Handling Hibernate lazy-loading
+ *
+ * @link https://github.com/FasterXML/jackson
+ * @link https://github.com/FasterXML/jackson-datatype-hibernate
+ * @link https://github.com/FasterXML/jackson-docs/wiki/JacksonHowToCustomSerializers
+ */
+public class JacksonObjectMapper extends ObjectMapper {
+
+ private static final ObjectMapper MAPPER = new JacksonObjectMapper();
+
+ private JacksonObjectMapper() {
+ registerModule(new Hibernate5Module());
+
+ registerModule(new JavaTimeModule());
+ configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+
+ setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE);
+ setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
+ setSerializationInclusion(JsonInclude.Include.NON_NULL);
+ }
+
+ public static ObjectMapper getMapper() {
+ return MAPPER;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ru/javawebinar/topjava/web/json/JsonUtil.java b/src/main/java/ru/javawebinar/topjava/web/json/JsonUtil.java
new file mode 100644
index 000000000000..eb7f05b2eeb8
--- /dev/null
+++ b/src/main/java/ru/javawebinar/topjava/web/json/JsonUtil.java
@@ -0,0 +1,49 @@
+package ru.javawebinar.topjava.web.json;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectReader;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import static ru.javawebinar.topjava.web.json.JacksonObjectMapper.getMapper;
+
+public class JsonUtil {
+
+ public static List readValues(String json, Class clazz) {
+ ObjectReader reader = getMapper().readerFor(clazz);
+ try {
+ return reader.readValues(json).readAll();
+ } catch (IOException e) {
+ throw new IllegalArgumentException("Invalid read array from JSON:\n'" + json + "'", e);
+ }
+ }
+
+ public static T readValue(String json, Class clazz) {
+ try {
+ return getMapper().readValue(json, clazz);
+ } catch (IOException e) {
+ throw new IllegalArgumentException("Invalid read from JSON:\n'" + json + "'", e);
+ }
+ }
+
+ public static String writeValue(T obj) {
+ try {
+ return getMapper().writeValueAsString(obj);
+ } catch (JsonProcessingException e) {
+ throw new IllegalStateException("Invalid write to JSON:\n'" + obj + "'", e);
+ }
+ }
+
+ public static String writeAdditionProps(T obj, String addName, Object addValue) {
+ return writeAdditionProps(obj, Map.of(addName, addValue));
+ }
+
+ public static String writeAdditionProps(T obj, Map addProps) {
+ Map map = getMapper().convertValue(obj, new TypeReference>() {});
+ map.putAll(addProps);
+ return writeValue(map);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ru/javawebinar/topjava/web/meal/AbstractMealController.java b/src/main/java/ru/javawebinar/topjava/web/meal/AbstractMealController.java
new file mode 100644
index 000000000000..50b345af22e6
--- /dev/null
+++ b/src/main/java/ru/javawebinar/topjava/web/meal/AbstractMealController.java
@@ -0,0 +1,72 @@
+package ru.javawebinar.topjava.web.meal;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.Nullable;
+import ru.javawebinar.topjava.model.Meal;
+import ru.javawebinar.topjava.service.MealService;
+import ru.javawebinar.topjava.to.MealTo;
+import ru.javawebinar.topjava.util.MealsUtil;
+import ru.javawebinar.topjava.web.SecurityUtil;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.List;
+
+import static ru.javawebinar.topjava.util.ValidationUtil.assureIdConsistent;
+import static ru.javawebinar.topjava.util.ValidationUtil.checkNew;
+
+public abstract class AbstractMealController {
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ @Autowired
+ private MealService service;
+
+ public Meal get(int id) {
+ int userId = SecurityUtil.authUserId();
+ log.info("get meal {} for user {}", id, userId);
+ return service.get(id, userId);
+ }
+
+ public void delete(int id) {
+ int userId = SecurityUtil.authUserId();
+ log.info("delete meal {} for user {}", id, userId);
+ service.delete(id, userId);
+ }
+
+ public List getAll() {
+ int userId = SecurityUtil.authUserId();
+ log.info("getAll for user {}", userId);
+ return MealsUtil.getTos(service.getAll(userId), SecurityUtil.authUserCaloriesPerDay());
+ }
+
+ public Meal create(Meal meal) {
+ int userId = SecurityUtil.authUserId();
+ checkNew(meal);
+ log.info("create {} for user {}", meal, userId);
+ return service.create(meal, userId);
+ }
+
+ public void update(Meal meal, int id) {
+ int userId = SecurityUtil.authUserId();
+ assureIdConsistent(meal, id);
+ log.info("update {} for user {}", meal, userId);
+ service.update(meal, userId);
+ }
+
+ /**
+ * Filter separately
+ * by date
+ * by time for every date
+ *
+ */
+ public List getBetween(@Nullable LocalDate startDate, @Nullable LocalTime startTime,
+ @Nullable LocalDate endDate, @Nullable LocalTime endTime) {
+ int userId = SecurityUtil.authUserId();
+ log.info("getBetween dates({} - {}) time({} - {}) for user {}", startDate, endDate, startTime, endTime, userId);
+
+ List mealsDateFiltered = service.getBetweenInclusive(startDate, endDate, userId);
+ return MealsUtil.getFilteredTos(mealsDateFiltered, SecurityUtil.authUserCaloriesPerDay(), startTime, endTime);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ru/javawebinar/topjava/web/meal/MealRestController.java b/src/main/java/ru/javawebinar/topjava/web/meal/MealRestController.java
new file mode 100644
index 000000000000..7d9c311767ef
--- /dev/null
+++ b/src/main/java/ru/javawebinar/topjava/web/meal/MealRestController.java
@@ -0,0 +1,70 @@
+package ru.javawebinar.topjava.web.meal;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.lang.Nullable;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import ru.javawebinar.topjava.View;
+import ru.javawebinar.topjava.model.Meal;
+import ru.javawebinar.topjava.to.MealTo;
+
+import java.net.URI;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.List;
+
+@RestController
+@RequestMapping(value = MealRestController.REST_URL, produces = MediaType.APPLICATION_JSON_VALUE)
+public class MealRestController extends AbstractMealController {
+ static final String REST_URL = "/rest/profile/meals";
+
+ @Override
+ @GetMapping("/{id}")
+ public Meal get(@PathVariable int id) {
+ return super.get(id);
+ }
+
+ @Override
+ @DeleteMapping("/{id}")
+ @ResponseStatus(value = HttpStatus.NO_CONTENT)
+ public void delete(@PathVariable int id) {
+ super.delete(id);
+ }
+
+ @Override
+ @GetMapping
+ public List getAll() {
+ return super.getAll();
+ }
+
+ @Override
+ @PutMapping(value = "/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @ResponseStatus(value = HttpStatus.NO_CONTENT)
+ public void update(@Validated(View.Web.class) @RequestBody Meal meal, @PathVariable int id) {
+ super.update(meal, id);
+ }
+
+ @PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE)
+ public ResponseEntity createWithLocation(@Validated(View.Web.class) @RequestBody Meal meal) {
+ Meal created = super.create(meal);
+
+ URI uriOfNewResource = ServletUriComponentsBuilder.fromCurrentContextPath()
+ .path(REST_URL + "/{id}")
+ .buildAndExpand(created.getId()).toUri();
+
+ return ResponseEntity.created(uriOfNewResource).body(created);
+ }
+
+ @Override
+ @GetMapping(value = "/filter")
+ public List getBetween(
+ @RequestParam @Nullable LocalDate startDate,
+ @RequestParam @Nullable LocalTime startTime,
+ @RequestParam @Nullable LocalDate endDate,
+ @RequestParam @Nullable LocalTime endTime) {
+ return super.getBetween(startDate, startTime, endDate, endTime);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ru/javawebinar/topjava/web/meal/MealUIController.java b/src/main/java/ru/javawebinar/topjava/web/meal/MealUIController.java
new file mode 100644
index 000000000000..df32adea57ad
--- /dev/null
+++ b/src/main/java/ru/javawebinar/topjava/web/meal/MealUIController.java
@@ -0,0 +1,58 @@
+package ru.javawebinar.topjava.web.meal;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.lang.Nullable;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import ru.javawebinar.topjava.View;
+import ru.javawebinar.topjava.model.Meal;
+import ru.javawebinar.topjava.to.MealTo;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.List;
+
+@RestController
+@RequestMapping("/profile/meals")
+public class MealUIController extends AbstractMealController {
+
+ @Override
+ @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
+ public List getAll() {
+ return super.getAll();
+ }
+
+ @Override
+ @GetMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
+ public Meal get(@PathVariable int id) {
+ return super.get(id);
+ }
+
+ @Override
+ @DeleteMapping(value = "/{id}")
+ @ResponseStatus(value = HttpStatus.NO_CONTENT)
+ public void delete(@PathVariable int id) {
+ super.delete(id);
+ }
+
+ @PostMapping
+ @ResponseStatus(value = HttpStatus.NO_CONTENT)
+ public void createOrUpdate(@Validated(View.Web.class) Meal meal) {
+ if (meal.isNew()) {
+ super.create(meal);
+ } else {
+ super.update(meal, meal.getId());
+ }
+ }
+
+ @Override
+ @GetMapping(value = "/filter", produces = MediaType.APPLICATION_JSON_VALUE)
+ public List getBetween(
+ @RequestParam @Nullable LocalDate startDate,
+ @RequestParam @Nullable LocalTime startTime,
+ @RequestParam @Nullable LocalDate endDate,
+ @RequestParam @Nullable LocalTime endTime) {
+ return super.getBetween(startDate, startTime, endDate, endTime);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ru/javawebinar/topjava/web/user/AbstractUserController.java b/src/main/java/ru/javawebinar/topjava/web/user/AbstractUserController.java
new file mode 100644
index 000000000000..17d0c0a06c6b
--- /dev/null
+++ b/src/main/java/ru/javawebinar/topjava/web/user/AbstractUserController.java
@@ -0,0 +1,117 @@
+package ru.javawebinar.topjava.web.user;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
+import org.springframework.validation.BindException;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+import ru.javawebinar.topjava.HasId;
+import ru.javawebinar.topjava.Profiles;
+import ru.javawebinar.topjava.model.AbstractBaseEntity;
+import ru.javawebinar.topjava.model.User;
+import ru.javawebinar.topjava.service.UserService;
+import ru.javawebinar.topjava.to.UserTo;
+import ru.javawebinar.topjava.util.UserUtil;
+import ru.javawebinar.topjava.util.exception.ModificationRestrictionException;
+
+import java.util.List;
+
+import static ru.javawebinar.topjava.util.ValidationUtil.assureIdConsistent;
+import static ru.javawebinar.topjava.util.ValidationUtil.checkNew;
+
+public abstract class AbstractUserController {
+ protected final Logger log = LoggerFactory.getLogger(getClass());
+
+ // Validate manually cause UniqueMailValidator doesn't work for update with user.id==null
+ private WebDataBinder binder;
+
+ @Autowired
+ protected UserService service;
+
+ @Autowired
+ private UniqueMailValidator emailValidator;
+
+ private boolean modificationRestriction;
+
+ @Autowired
+ @SuppressWarnings("deprecation")
+ public void setEnvironment(Environment environment) {
+ modificationRestriction = environment.acceptsProfiles(Profiles.HEROKU);
+ }
+
+ @InitBinder
+ protected void initBinder(WebDataBinder binder) {
+ if (binder.getTarget() != null && emailValidator.supports(binder.getTarget().getClass())) {
+ binder.addValidators(emailValidator);
+ this.binder = binder;
+ }
+ }
+
+ public List getAll() {
+ log.info("getAll");
+ return service.getAll();
+ }
+
+ public User get(int id) {
+ log.info("get {}", id);
+ return service.get(id);
+ }
+
+ public User create(UserTo userTo) {
+ log.info("create from to {}", userTo);
+ return create(UserUtil.createNewFromTo(userTo));
+ }
+
+ public User create(User user) {
+ log.info("create {}", user);
+ checkNew(user);
+ return service.create(user);
+ }
+
+ public void delete(int id) {
+ log.info("delete {}", id);
+ checkModificationAllowed(id);
+ service.delete(id);
+ }
+
+ protected void checkAndValidateForUpdate(HasId user, int id) throws BindException {
+ log.info("update {} with id={}", user, id);
+ assureIdConsistent(user, id);
+ checkModificationAllowed(id);
+ binder.validate();
+ if (binder.getBindingResult().hasErrors()) {
+ throw new BindException(binder.getBindingResult());
+ }
+ }
+
+ public void update(UserTo userTo, int id) {
+ log.info("update {} with id={}", userTo, id);
+ assureIdConsistent(userTo, id);
+ checkModificationAllowed(id);
+ service.update(userTo);
+ }
+
+ public User getByMail(String email) {
+ log.info("getByEmail {}", email);
+ return service.getByEmail(email);
+ }
+
+ public void enable(int id, boolean enabled) {
+ log.info(enabled ? "enable {}" : "disable {}", id);
+ checkModificationAllowed(id);
+ service.enable(id, enabled);
+ }
+
+ public User getWithMeals(int id) {
+ log.info("getWithMeals {}", id);
+ return service.getWithMeals(id);
+ }
+
+ private void checkModificationAllowed(int id) {
+ if (modificationRestriction && id < AbstractBaseEntity.START_SEQ + 2) {
+ throw new ModificationRestrictionException();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ru/javawebinar/topjava/web/user/AdminRestController.java b/src/main/java/ru/javawebinar/topjava/web/user/AdminRestController.java
new file mode 100644
index 000000000000..7e734fbb8c17
--- /dev/null
+++ b/src/main/java/ru/javawebinar/topjava/web/user/AdminRestController.java
@@ -0,0 +1,72 @@
+package ru.javawebinar.topjava.web.user;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.BindException;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import ru.javawebinar.topjava.View;
+import ru.javawebinar.topjava.model.User;
+
+import java.net.URI;
+import java.util.List;
+
+@RestController
+@RequestMapping(value = AdminRestController.REST_URL, produces = MediaType.APPLICATION_JSON_VALUE)
+public class AdminRestController extends AbstractUserController {
+
+ static final String REST_URL = "/rest/admin/users";
+
+ @GetMapping
+ public List getAll() {
+ return super.getAll();
+ }
+
+ @Override
+ @GetMapping("/{id}")
+ public User get(@PathVariable int id) {
+ return super.get(id);
+ }
+
+ @PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE)
+ public ResponseEntity createWithLocation(@Validated(View.Web.class) @RequestBody User user) {
+ User created = super.create(user);
+ URI uriOfNewResource = ServletUriComponentsBuilder.fromCurrentContextPath()
+ .path(REST_URL + "/{id}")
+ .buildAndExpand(created.getId()).toUri();
+ return ResponseEntity.created(uriOfNewResource).body(created);
+ }
+
+ @Override
+ @DeleteMapping("/{id}")
+ @ResponseStatus(HttpStatus.NO_CONTENT)
+ public void delete(@PathVariable int id) {
+ super.delete(id);
+ }
+
+ @PutMapping(value = "/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @ResponseStatus(value = HttpStatus.NO_CONTENT)
+ public void update(@RequestBody User user, @PathVariable int id) throws BindException {
+ checkAndValidateForUpdate(user, id);
+ service.update(user);
+ }
+
+ @GetMapping("/by")
+ public User getByMail(@RequestParam String email) {
+ return super.getByMail(email);
+ }
+
+ @Override
+ @PatchMapping("/{id}")
+ @ResponseStatus(value = HttpStatus.NO_CONTENT)
+ public void enable(@PathVariable int id, @RequestParam boolean enabled) {
+ super.enable(id, enabled);
+ }
+
+ @GetMapping("/{id}/with-meals")
+ public User getWithMeals(@PathVariable int id) {
+ return super.getWithMeals(id);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ru/javawebinar/topjava/web/user/AdminUIController.java b/src/main/java/ru/javawebinar/topjava/web/user/AdminUIController.java
new file mode 100644
index 000000000000..ea026c2e5da6
--- /dev/null
+++ b/src/main/java/ru/javawebinar/topjava/web/user/AdminUIController.java
@@ -0,0 +1,51 @@
+package ru.javawebinar.topjava.web.user;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import ru.javawebinar.topjava.model.User;
+import ru.javawebinar.topjava.to.UserTo;
+
+import javax.validation.Valid;
+import java.util.List;
+
+@RestController
+@RequestMapping("/admin/users")
+public class AdminUIController extends AbstractUserController {
+
+ @Override
+ @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
+ public List getAll() {
+ return super.getAll();
+ }
+
+ @Override
+ @GetMapping(value = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
+ public User get(@PathVariable int id) {
+ return super.get(id);
+ }
+
+ @Override
+ @DeleteMapping("/{id}")
+ @ResponseStatus(value = HttpStatus.NO_CONTENT)
+ public void delete(@PathVariable int id) {
+ super.delete(id);
+ }
+
+ @PostMapping
+ @ResponseStatus(value = HttpStatus.NO_CONTENT)
+ public void createOrUpdate(@Valid UserTo userTo) {
+ if (userTo.isNew()) {
+ super.create(userTo);
+ } else {
+ super.update(userTo, userTo.id());
+ }
+ }
+
+ @Override
+ @PostMapping("/{id}")
+ @ResponseStatus(value = HttpStatus.NO_CONTENT)
+ public void enable(@PathVariable int id, @RequestParam boolean enabled) {
+ super.enable(id, enabled);
+ }
+}
diff --git a/src/main/java/ru/javawebinar/topjava/web/user/ProfileRestController.java b/src/main/java/ru/javawebinar/topjava/web/user/ProfileRestController.java
new file mode 100644
index 000000000000..c263bb7fef3e
--- /dev/null
+++ b/src/main/java/ru/javawebinar/topjava/web/user/ProfileRestController.java
@@ -0,0 +1,58 @@
+package ru.javawebinar.topjava.web.user;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.validation.BindException;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import ru.javawebinar.topjava.AuthorizedUser;
+import ru.javawebinar.topjava.model.User;
+import ru.javawebinar.topjava.to.UserTo;
+
+import javax.validation.Valid;
+import java.net.URI;
+
+@RestController
+@RequestMapping(ProfileRestController.REST_URL)
+public class ProfileRestController extends AbstractUserController {
+ static final String REST_URL = "/rest/profile";
+
+ @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
+ public User get(@AuthenticationPrincipal AuthorizedUser authUser) {
+ return super.get(authUser.getId());
+ }
+
+ @DeleteMapping
+ @ResponseStatus(HttpStatus.NO_CONTENT)
+ public void delete(@AuthenticationPrincipal AuthorizedUser authUser) {
+ super.delete(authUser.getId());
+ }
+
+ @PostMapping(value = "/register", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @ResponseStatus(value = HttpStatus.CREATED)
+ public ResponseEntity register(@Valid @RequestBody UserTo userTo) {
+ User created = super.create(userTo);
+ URI uriOfNewResource = ServletUriComponentsBuilder.fromCurrentContextPath()
+ .path(REST_URL).build().toUri();
+ return ResponseEntity.created(uriOfNewResource).body(created);
+ }
+
+ @PutMapping(consumes = MediaType.APPLICATION_JSON_VALUE)
+ @ResponseStatus(HttpStatus.NO_CONTENT)
+ public void update(@RequestBody UserTo userTo, @AuthenticationPrincipal AuthorizedUser authUser) throws BindException {
+ checkAndValidateForUpdate(userTo, authUser.getId());
+ service.update(userTo);
+ }
+
+ @GetMapping(value = "/text")
+ public String testUTF() {
+ return "Русский текст";
+ }
+
+ @GetMapping("/with-meals")
+ public User getWithMeals(@AuthenticationPrincipal AuthorizedUser authUser) {
+ return super.getWithMeals(authUser.getId());
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ru/javawebinar/topjava/web/user/ProfileUIController.java b/src/main/java/ru/javawebinar/topjava/web/user/ProfileUIController.java
new file mode 100644
index 000000000000..47d670ec9df3
--- /dev/null
+++ b/src/main/java/ru/javawebinar/topjava/web/user/ProfileUIController.java
@@ -0,0 +1,54 @@
+package ru.javawebinar.topjava.web.user;
+
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.support.SessionStatus;
+import ru.javawebinar.topjava.AuthorizedUser;
+import ru.javawebinar.topjava.to.UserTo;
+
+import javax.validation.Valid;
+
+@Controller
+@RequestMapping("/profile")
+public class ProfileUIController extends AbstractUserController {
+
+ @GetMapping
+ public String profile(ModelMap model, @AuthenticationPrincipal AuthorizedUser authUser) {
+ model.addAttribute("userTo", authUser.getUserTo());
+ return "profile";
+ }
+
+ @PostMapping
+ public String updateProfile(@Valid UserTo userTo, BindingResult result, SessionStatus status, @AuthenticationPrincipal AuthorizedUser authUser) {
+ if (result.hasErrors()) {
+ return "profile";
+ }
+ super.update(userTo, authUser.getId());
+ authUser.update(userTo);
+ status.setComplete();
+ return "redirect:/meals";
+ }
+
+ @GetMapping("/register")
+ public String register(ModelMap model) {
+ model.addAttribute("userTo", new UserTo());
+ model.addAttribute("register", true);
+ return "profile";
+ }
+
+ @PostMapping("/register")
+ public String saveRegister(@Valid UserTo userTo, BindingResult result, SessionStatus status, ModelMap model) {
+ if (result.hasErrors()) {
+ model.addAttribute("register", true);
+ return "profile";
+ }
+ super.create(userTo);
+ status.setComplete();
+ return "redirect:/login?message=app.registered&username=" + userTo.getEmail();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/ru/javawebinar/topjava/web/user/UniqueMailValidator.java b/src/main/java/ru/javawebinar/topjava/web/user/UniqueMailValidator.java
new file mode 100644
index 000000000000..68717daa793f
--- /dev/null
+++ b/src/main/java/ru/javawebinar/topjava/web/user/UniqueMailValidator.java
@@ -0,0 +1,34 @@
+package ru.javawebinar.topjava.web.user;
+
+
+import org.springframework.stereotype.Component;
+import org.springframework.validation.Errors;
+import ru.javawebinar.topjava.HasIdAndEmail;
+import ru.javawebinar.topjava.model.User;
+import ru.javawebinar.topjava.repository.UserRepository;
+import ru.javawebinar.topjava.web.ExceptionInfoHandler;
+
+
+@Component
+public class UniqueMailValidator implements org.springframework.validation.Validator {
+
+ private final UserRepository repository;
+
+ public UniqueMailValidator(UserRepository repository) {
+ this.repository = repository;
+ }
+
+ @Override
+ public boolean supports(Class clazz) {
+ return HasIdAndEmail.class.isAssignableFrom(clazz);
+ }
+
+ @Override
+ public void validate(Object target, Errors errors) {
+ HasIdAndEmail user = ((HasIdAndEmail) target);
+ User dbUser = repository.getByEmail(user.getEmail().toLowerCase());
+ if (dbUser != null && !dbUser.getId().equals(user.getId())) {
+ errors.rejectValue("email", ExceptionInfoHandler.EXCEPTION_DUPLICATE_EMAIL);
+ }
+ }
+}
diff --git a/src/main/resources/cache/ehcache.xml b/src/main/resources/cache/ehcache.xml
new file mode 100644
index 000000000000..c6347bd940d6
--- /dev/null
+++ b/src/main/resources/cache/ehcache.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+ 5
+
+ 5000
+
+
+
+
+
+ 1
+
+
+
diff --git a/src/main/resources/db/heroku.properties b/src/main/resources/db/heroku.properties
new file mode 100644
index 000000000000..c8146ba6f139
--- /dev/null
+++ b/src/main/resources/db/heroku.properties
@@ -0,0 +1,5 @@
+jpa.showSql=false
+hibernate.format_sql=false
+hibernate.use_sql_comments=false
+database.init=false
+jdbc.initLocation=initDB.sql
\ No newline at end of file
diff --git a/src/main/resources/db/hsqldb.properties b/src/main/resources/db/hsqldb.properties
new file mode 100644
index 000000000000..17c03ef4ebda
--- /dev/null
+++ b/src/main/resources/db/hsqldb.properties
@@ -0,0 +1,11 @@
+#database.url=jdbc:hsqldb:file:D:/temp/topjava
+
+database.url=jdbc:hsqldb:mem:topjava
+database.username=sa
+database.password=
+
+database.init=true
+jdbc.initLocation=classpath:db/initDB_hsql.sql
+jpa.showSql=true
+hibernate.format_sql=true
+hibernate.use_sql_comments=true
\ No newline at end of file
diff --git a/src/main/resources/db/initDB.sql b/src/main/resources/db/initDB.sql
new file mode 100644
index 000000000000..af0ff307cb0a
--- /dev/null
+++ b/src/main/resources/db/initDB.sql
@@ -0,0 +1,37 @@
+DROP TABLE IF EXISTS user_roles;
+DROP TABLE IF EXISTS meals;
+DROP TABLE IF EXISTS users;
+DROP SEQUENCE IF EXISTS global_seq;
+
+CREATE SEQUENCE global_seq START WITH 100000;
+
+CREATE TABLE users
+(
+ id INTEGER PRIMARY KEY DEFAULT nextval('global_seq'),
+ name VARCHAR NOT NULL,
+ email VARCHAR NOT NULL,
+ password VARCHAR NOT NULL,
+ registered TIMESTAMP DEFAULT now() NOT NULL,
+ enabled BOOL DEFAULT TRUE NOT NULL,
+ calories_per_day INTEGER DEFAULT 2000 NOT NULL
+);
+CREATE UNIQUE INDEX users_unique_email_idx ON users (email);
+
+CREATE TABLE user_roles
+(
+ user_id INTEGER NOT NULL,
+ role VARCHAR,
+ CONSTRAINT user_roles_idx UNIQUE (user_id, role),
+ FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
+);
+
+CREATE TABLE meals
+(
+ id INTEGER PRIMARY KEY DEFAULT nextval('global_seq'),
+ user_id INTEGER NOT NULL,
+ date_time TIMESTAMP NOT NULL,
+ description TEXT NOT NULL,
+ calories INT NOT NULL,
+ FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
+);
+CREATE UNIQUE INDEX meals_unique_user_datetime_idx ON meals (user_id, date_time);
\ No newline at end of file
diff --git a/src/main/resources/db/initDB_hsql.sql b/src/main/resources/db/initDB_hsql.sql
new file mode 100644
index 000000000000..37f2da1bf3d8
--- /dev/null
+++ b/src/main/resources/db/initDB_hsql.sql
@@ -0,0 +1,39 @@
+DROP TABLE user_roles IF EXISTS;
+DROP TABLE meals IF EXISTS;
+DROP TABLE users IF EXISTS;
+DROP SEQUENCE global_seq IF EXISTS;
+
+CREATE SEQUENCE GLOBAL_SEQ AS INTEGER START WITH 100000;
+
+CREATE TABLE users
+(
+ id INTEGER GENERATED BY DEFAULT AS SEQUENCE GLOBAL_SEQ PRIMARY KEY,
+ name VARCHAR(255) NOT NULL,
+ email VARCHAR(255) NOT NULL,
+ password VARCHAR(255) NOT NULL,
+ registered TIMESTAMP DEFAULT now() NOT NULL,
+ enabled BOOLEAN DEFAULT TRUE NOT NULL,
+ calories_per_day INTEGER DEFAULT 2000 NOT NULL
+);
+CREATE UNIQUE INDEX users_unique_email_idx
+ ON USERS (email);
+
+CREATE TABLE user_roles
+(
+ user_id INTEGER NOT NULL,
+ role VARCHAR(255),
+ CONSTRAINT user_roles_idx UNIQUE (user_id, role),
+ FOREIGN KEY (user_id) REFERENCES USERS (id) ON DELETE CASCADE
+);
+
+CREATE TABLE meals
+(
+ id INTEGER GENERATED BY DEFAULT AS SEQUENCE GLOBAL_SEQ PRIMARY KEY,
+ date_time TIMESTAMP NOT NULL,
+ description VARCHAR(255) NOT NULL,
+ calories INT NOT NULL,
+ user_id INTEGER NOT NULL,
+ FOREIGN KEY (user_id) REFERENCES USERS (id) ON DELETE CASCADE
+);
+CREATE UNIQUE INDEX meals_unique_user_datetime_idx
+ ON meals (user_id, date_time)
\ No newline at end of file
diff --git a/src/main/resources/db/populateDB.sql b/src/main/resources/db/populateDB.sql
new file mode 100644
index 000000000000..dd2adc28b266
--- /dev/null
+++ b/src/main/resources/db/populateDB.sql
@@ -0,0 +1,24 @@
+DELETE FROM user_roles;
+DELETE FROM meals;
+DELETE FROM users;
+ALTER SEQUENCE global_seq RESTART WITH 100000;
+
+INSERT INTO users (name, email, password, calories_per_day)
+VALUES ('User', 'user@yandex.ru', '{noop}password', 2005),
+ ('Admin', 'admin@gmail.com', '{noop}admin', 1900);
+
+INSERT INTO user_roles (role, user_id)
+VALUES ('USER', 100000),
+ ('ADMIN', 100001),
+ ('USER', 100001);
+
+INSERT INTO meals (date_time, description, calories, user_id)
+VALUES ('2020-01-30 10:00:00', 'Завтрак', 500, 100000),
+ ('2020-01-30 13:00:00', 'Обед', 1000, 100000),
+ ('2020-01-30 20:00:00', 'Ужин', 500, 100000),
+ ('2020-01-31 0:00:00', 'Еда на граничное значение', 100, 100000),
+ ('2020-01-31 10:00:00', 'Завтрак', 500, 100000),
+ ('2020-01-31 13:00:00', 'Обед', 1000, 100000),
+ ('2020-01-31 20:00:00', 'Ужин', 510, 100000),
+ ('2020-01-31 14:00:00', 'Админ ланч', 510, 100001),
+ ('2020-01-31 21:00:00', 'Админ ужин', 1500, 100001);
\ No newline at end of file
diff --git a/src/main/resources/db/postgres.properties b/src/main/resources/db/postgres.properties
new file mode 100644
index 000000000000..b68d5b62087f
--- /dev/null
+++ b/src/main/resources/db/postgres.properties
@@ -0,0 +1,13 @@
+#database.url=jdbc:postgresql://ec2-54-247-74-197.eu-west-1.compute.amazonaws.com:5432/de4fjsqhdvl7ld?ssl=true&sslmode=require&sslfactory=org.postgresql.ssl.NonValidatingFactory
+#database.username=anbxkjtzukqacj
+#database.password=da1f25b2a38784fb0d46858e5b8fc168e08c9e1e9c72faea5bbac9c0e1f9c24f
+
+database.url=jdbc:postgresql://localhost:5432/topjava
+database.username=user
+database.password=password
+
+database.init=true
+jdbc.initLocation=classpath:db/initDB.sql
+jpa.showSql=true
+hibernate.format_sql=true
+hibernate.use_sql_comments=false
\ No newline at end of file
diff --git a/src/main/resources/db/tomcat.properties b/src/main/resources/db/tomcat.properties
new file mode 100644
index 000000000000..2e073681ad16
--- /dev/null
+++ b/src/main/resources/db/tomcat.properties
@@ -0,0 +1,5 @@
+database.init=false
+jdbc.initLocation=initDB.sql
+jpa.showSql=true
+hibernate.format_sql=true
+hibernate.use_sql_comments=true
\ No newline at end of file
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
new file mode 100644
index 000000000000..ab4cfe51e08a
--- /dev/null
+++ b/src/main/resources/logback.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+ ${TOPJAVA_ROOT}/log/topjava.log
+
+
+ UTF-8
+ %date %-5level %logger{50}.%M:%L - %msg%n
+
+
+
+
+
+ UTF-8
+ %d{HH:mm:ss.SSS} %highlight(%-5level) %cyan(%class{50}.%M:%L) - %msg%n
+
+
+
+
+
+
diff --git a/src/main/resources/spring/spring-app.xml b/src/main/resources/spring/spring-app.xml
new file mode 100644
index 000000000000..3a75ebb82910
--- /dev/null
+++ b/src/main/resources/spring/spring-app.xml
@@ -0,0 +1,16 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/spring/spring-cache.xml b/src/main/resources/spring/spring-cache.xml
new file mode 100644
index 000000000000..73325fee065f
--- /dev/null
+++ b/src/main/resources/spring/spring-cache.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/spring/spring-db.xml b/src/main/resources/spring/spring-db.xml
new file mode 100644
index 000000000000..51f5ed85158f
--- /dev/null
+++ b/src/main/resources/spring/spring-db.xml
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/spring/spring-mvc.xml b/src/main/resources/spring/spring-mvc.xml
new file mode 100644
index 000000000000..dc53cccaeb13
--- /dev/null
+++ b/src/main/resources/spring/spring-mvc.xml
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+ text/plain;charset=UTF-8
+ text/html;charset=UTF-8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/spring/spring-security.xml b/src/main/resources/spring/spring-security.xml
new file mode 100644
index 000000000000..e3c3a864c5f8
--- /dev/null
+++ b/src/main/resources/spring/spring-security.xml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/tomcat/context.xml b/src/main/resources/tomcat/context.xml
new file mode 100644
index 000000000000..9311d5904aea
--- /dev/null
+++ b/src/main/resources/tomcat/context.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+ WEB-INF/web.xml
+ ${catalina.base}/conf/web.xml
+
+
+
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/exception.jsp b/src/main/webapp/WEB-INF/jsp/exception.jsp
new file mode 100644
index 000000000000..00a590c8751c
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/exception.jsp
@@ -0,0 +1,26 @@
+<%@ page isErrorPage="true" contentType="text/html" pageEncoding="UTF-8" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+
+
+
+
${status}
+ ${typeMessage}
+ ${message}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp b/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp
new file mode 100644
index 000000000000..cf1331fd5523
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/fragments/footer.jsp
@@ -0,0 +1,8 @@
+<%@page contentType="text/html" pageEncoding="UTF-8" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%--https://getbootstrap.com/docs/4.0/examples/sticky-footer/--%>
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp b/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp
new file mode 100644
index 000000000000..6a442be51c19
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp
@@ -0,0 +1,29 @@
+<%@page contentType="text/html" pageEncoding="UTF-8" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
+
+
+ <spring:message code="app.title"/>
+
+
+
+ ${sessionScope["SPRING_SECURITY_LAST_EXCEPTION"].message}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Spring Security ,
+
Spring MVC ,
+
Spring Data JPA ,
+
Spring Security
+ Test ,
+
Hibernate ORM ,
+
Hibernate Validator ,
+
SLF4J ,
+
Json Jackson ,
+
JSP ,
+
JSTL ,
+
Apache Tomcat ,
+
WebJars ,
+
DataTables plugin ,
+
EHCACHE ,
+
PostgreSQL ,
+
JUnit ,
+
Hamcrest ,
+
jQuery ,
+
jQuery notification ,
+
Bootstrap .
+
+
+
+
+
+
+ <%--https://getbootstrap.com/docs/4.0/components/card/--%>
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/profile.jsp b/src/main/webapp/WEB-INF/jsp/profile.jsp
new file mode 100644
index 000000000000..9b6f6af17e8c
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/profile.jsp
@@ -0,0 +1,44 @@
+<%@ page contentType="text/html" pageEncoding="UTF-8" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="topjava" tagdir="/WEB-INF/tags" %>
+
+
+
+
+ <%--@elvariable id="userTo" type="ru.javawebinar.topjava.to.UserTo"--%>
+
+
+
${userTo.name}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/inputField.tag b/src/main/webapp/WEB-INF/tags/inputField.tag
new file mode 100644
index 000000000000..2d8f465488a1
--- /dev/null
+++ b/src/main/webapp/WEB-INF/tags/inputField.tag
@@ -0,0 +1,19 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+
+<%@ attribute name="name" required="true" description="Name of corresponding property in bean object" %>
+<%@ attribute name="labelCode" required="true" description="Field label" %>
+<%@ attribute name="inputType" required="false" description="Input type" %>
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tld/functions.tld b/src/main/webapp/WEB-INF/tld/functions.tld
new file mode 100644
index 000000000000..d138fecdbfb5
--- /dev/null
+++ b/src/main/webapp/WEB-INF/tld/functions.tld
@@ -0,0 +1,16 @@
+
+
+
+ 1.0
+ functions
+ http://topjava.javawebinar.ru/functions
+
+
+ formatDateTime
+ ru.javawebinar.topjava.util.DateTimeUtil
+ java.lang.String toString(java.time.LocalDateTime)
+
+
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000000..834c26575d3a
--- /dev/null
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,70 @@
+
+
+ Topjava
+
+
+ spring.profiles.default
+ postgres,datajpa
+
+
+
+ contextConfigLocation
+
+ classpath:spring/spring-app.xml
+ classpath:spring/spring-db.xml
+
+
+
+
+
+ org.springframework.web.context.ContextLoaderListener
+
+
+ mvc-dispatcher
+ org.springframework.web.servlet.DispatcherServlet
+
+ contextConfigLocation
+ classpath:spring/spring-mvc.xml
+
+
+ throwExceptionIfNoHandlerFound
+ true
+
+ 1
+
+
+ mvc-dispatcher
+ /
+
+
+
+ encodingFilter
+ org.springframework.web.filter.CharacterEncodingFilter
+
+ encoding
+ UTF-8
+
+
+ forceEncoding
+ true
+
+
+
+ encodingFilter
+ /*
+
+
+
+
+ springSecurityFilterChain
+ org.springframework.web.filter.DelegatingFilterProxy
+
+
+ springSecurityFilterChain
+ /*
+
+
diff --git a/src/main/webapp/resources/css/style.css b/src/main/webapp/resources/css/style.css
new file mode 100644
index 000000000000..fa2c6131cf08
--- /dev/null
+++ b/src/main/webapp/resources/css/style.css
@@ -0,0 +1,55 @@
+tr[data-mealExcess="false"] {
+ color: green;
+}
+
+tr[data-mealExcess="true"] {
+ color: red;
+}
+
+.fa {
+ cursor: pointer;
+}
+
+tr[data-userEnabled="false"] {
+ opacity: 0.3;
+}
+
+.error, .message {
+ padding: 10px;
+ border-radius: 4px;
+ font-size: 16px;
+}
+
+.error {
+ color: #a94442;
+ background-color: #f2dede;
+ border: 1px solid #ebccd1;
+}
+
+.message {
+ color: #2f9635;
+ background-color: #c6fbc2;
+ border: 1px solid #9feba6;
+}
+
+/*https://stackoverflow.com/a/53855189/548473*/
+#noty_layout__bottomRight {
+ width: 385px !important;
+}
+
+/*https://getbootstrap.com/docs/4.0/examples/sticky-footer/sticky-footer.css*/
+html {
+ position: relative;
+ min-height: 100%;
+}
+body {
+ margin-bottom: 60px; /* Margin bottom by footer height */
+}
+.footer {
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ height: 60px; /* Set the fixed height of the footer here */
+ line-height: 60px; /* Vertically center the text there */
+ background-color: #f5f5f5;
+}
diff --git a/src/main/webapp/resources/images/icon-meal.png b/src/main/webapp/resources/images/icon-meal.png
new file mode 100644
index 000000000000..b4fc54ad0129
Binary files /dev/null and b/src/main/webapp/resources/images/icon-meal.png differ
diff --git a/src/main/webapp/resources/js/topjava.common.js b/src/main/webapp/resources/js/topjava.common.js
new file mode 100644
index 000000000000..365e4384b6b3
--- /dev/null
+++ b/src/main/webapp/resources/js/topjava.common.js
@@ -0,0 +1,120 @@
+var ajaxUrl, datatableApi, updateTable, form;
+
+function makeEditable(aUrl, datatableOpts, upTable) {
+ ajaxUrl = aUrl;
+ datatableApi = $("#datatable").DataTable(
+ // https://api.jquery.com/jquery.extend/#jQuery-extend-deep-target-object1-objectN
+ $.extend(true, datatableOpts,
+ {
+ "ajax": {
+ "url": ajaxUrl,
+ "dataSrc": ""
+ },
+ "paging": false,
+ "info": true,
+ "language": {
+ "search": i18n["common.search"]
+ }
+ }
+ ));
+ updateTable = upTable;
+ form = $('#detailsForm');
+ $(document).ajaxError(function (event, jqXHR, options, jsExc) {
+ failNoty(jqXHR);
+ });
+
+ // solve problem with cache in IE: https://stackoverflow.com/a/4303862/548473
+ $.ajaxSetup({cache: false});
+
+ var token = $("meta[name='_csrf']").attr("content");
+ var header = $("meta[name='_csrf_header']").attr("content");
+ $(document).ajaxSend(function (e, xhr, options) {
+ xhr.setRequestHeader(header, token);
+ });
+}
+
+function add() {
+ $("#modalTitle").html(i18n["addTitle"]);
+ form.find(":input").val("");
+ $("#editRow").modal();
+}
+
+function updateRow(id) {
+ $("#modalTitle").html(i18n["editTitle"]);
+ form.find(":input").val("");
+ $.get(ajaxUrl + id, function (data) {
+ $.each(data, function (key, value) {
+ form.find("input[name='" + key + "']").val(value);
+ });
+ $('#editRow').modal();
+ });
+}
+
+function deleteRow(id) {
+ if (confirm(i18n['common.confirm'])) {
+ $.ajax({
+ url: ajaxUrl + id,
+ type: "DELETE"
+ }).done(function () {
+ updateTable();
+ successNoty("common.deleted");
+ });
+ }
+}
+
+function updateTableByData(data) {
+ datatableApi.clear().rows.add(data).draw();
+}
+
+function save() {
+ $.ajax({
+ type: "POST",
+ url: ajaxUrl,
+ data: form.serialize()
+ }).done(function () {
+ $("#editRow").modal("hide");
+ updateTable();
+ successNoty("common.saved");
+ });
+}
+
+var failedNote;
+
+function closeNoty() {
+ if (failedNote) {
+ failedNote.close();
+ failedNote = undefined;
+ }
+}
+
+function successNoty(key) {
+ closeNoty();
+ new Noty({
+ text: "" + data + " ";
+ }
+ return data;
+ }
+ },
+ {
+ "data": "roles"
+ },
+ {
+ "data": "enabled",
+ "render": function (data, type, row) {
+ if (type === "display") {
+ return " MEAL_MATCHER = TestMatcher.usingFieldsWithIgnoringAssertions(Meal.class, "user");
+ public static TestMatcher MEAL_TO_MATCHER = TestMatcher.usingEqualsAssertions(MealTo.class);
+
+ public static final int NOT_FOUND = 10;
+ public static final int MEAL1_ID = START_SEQ + 2;
+ public static final int ADMIN_MEAL_ID = START_SEQ + 9;
+
+ public static final Meal MEAL1 = new Meal(MEAL1_ID, of(2020, Month.JANUARY, 30, 10, 0), "Завтрак", 500);
+ public static final Meal MEAL2 = new Meal(MEAL1_ID + 1, of(2020, Month.JANUARY, 30, 13, 0), "Обед", 1000);
+ public static final Meal MEAL3 = new Meal(MEAL1_ID + 2, of(2020, Month.JANUARY, 30, 20, 0), "Ужин", 500);
+ public static final Meal MEAL4 = new Meal(MEAL1_ID + 3, of(2020, Month.JANUARY, 31, 0, 0), "Еда на граничное значение", 100);
+ public static final Meal MEAL5 = new Meal(MEAL1_ID + 4, of(2020, Month.JANUARY, 31, 10, 0), "Завтрак", 500);
+ public static final Meal MEAL6 = new Meal(MEAL1_ID + 5, of(2020, Month.JANUARY, 31, 13, 0), "Обед", 1000);
+ public static final Meal MEAL7 = new Meal(MEAL1_ID + 6, of(2020, Month.JANUARY, 31, 20, 0), "Ужин", 510);
+ public static final Meal ADMIN_MEAL1 = new Meal(ADMIN_MEAL_ID, of(2020, Month.JANUARY, 31, 14, 0), "Админ ланч", 510);
+ public static final Meal ADMIN_MEAL2 = new Meal(ADMIN_MEAL_ID + 1, of(2020, Month.JANUARY, 31, 21, 0), "Админ ужин", 1500);
+
+ public static final List MEALS = List.of(MEAL7, MEAL6, MEAL5, MEAL4, MEAL3, MEAL2, MEAL1);
+
+ public static Meal getNew() {
+ return new Meal(null, of(2020, Month.FEBRUARY, 1, 18, 0), "Созданный ужин", 300);
+ }
+
+ public static Meal getUpdated() {
+ return new Meal(MEAL1_ID, MEAL1.getDateTime(), "Обновленный завтрак", 200);
+ }
+}
diff --git a/src/test/java/ru/javawebinar/topjava/SpringMain.java b/src/test/java/ru/javawebinar/topjava/SpringMain.java
new file mode 100644
index 000000000000..302739536c03
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/SpringMain.java
@@ -0,0 +1,44 @@
+package ru.javawebinar.topjava;
+
+import org.springframework.context.support.GenericXmlApplicationContext;
+import ru.javawebinar.topjava.model.Role;
+import ru.javawebinar.topjava.model.User;
+import ru.javawebinar.topjava.to.MealTo;
+import ru.javawebinar.topjava.web.meal.MealRestController;
+import ru.javawebinar.topjava.web.user.AdminRestController;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.Month;
+import java.util.Arrays;
+import java.util.List;
+
+import static ru.javawebinar.topjava.TestUtil.mockAuthorize;
+import static ru.javawebinar.topjava.UserTestData.USER;
+
+public class SpringMain {
+ public static void main(String[] args) {
+ // java 7 automatic resource management
+ try (GenericXmlApplicationContext appCtx = new GenericXmlApplicationContext()) {
+ appCtx.getEnvironment().setActiveProfiles(Profiles.getActiveDbProfile(), Profiles.REPOSITORY_IMPLEMENTATION);
+ appCtx.load("spring/inmemory.xml");
+ appCtx.refresh();
+
+ System.out.println("Bean definition names: " + Arrays.toString(appCtx.getBeanDefinitionNames()));
+ AdminRestController adminUserController = appCtx.getBean(AdminRestController.class);
+ adminUserController.create(new User(null, "userName", "email@mail.ru", "password", 2000, Role.ADMIN));
+ System.out.println();
+
+ mockAuthorize(USER);
+
+ MealRestController mealController = appCtx.getBean(MealRestController.class);
+ List filteredMealsWithExcess =
+ mealController.getBetween(
+ LocalDate.of(2020, Month.JANUARY, 30), LocalTime.of(7, 0),
+ LocalDate.of(2020, Month.JANUARY, 31), LocalTime.of(11, 0));
+ filteredMealsWithExcess.forEach(System.out::println);
+ System.out.println();
+ System.out.println(mealController.getBetween(null, null, null, null));
+ }
+ }
+}
diff --git a/src/test/java/ru/javawebinar/topjava/TestMatcher.java b/src/test/java/ru/javawebinar/topjava/TestMatcher.java
new file mode 100644
index 000000000000..243e64599b78
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/TestMatcher.java
@@ -0,0 +1,63 @@
+package ru.javawebinar.topjava;
+
+import org.springframework.test.web.servlet.ResultMatcher;
+
+import java.util.List;
+import java.util.function.BiConsumer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static ru.javawebinar.topjava.TestUtil.readListFromJsonMvcResult;
+
+public class TestMatcher {
+ private final Class clazz;
+ private final BiConsumer assertion;
+ private final BiConsumer, Iterable> iterableAssertion;
+
+ private TestMatcher(Class clazz, BiConsumer assertion, BiConsumer, Iterable> iterableAssertion) {
+ this.clazz = clazz;
+ this.assertion = assertion;
+ this.iterableAssertion = iterableAssertion;
+ }
+
+ public static TestMatcher usingAssertions(Class clazz, BiConsumer assertion, BiConsumer, Iterable> iterableAssertion) {
+ return new TestMatcher<>(clazz, assertion, iterableAssertion);
+ }
+
+ public static TestMatcher usingEqualsAssertions(Class clazz) {
+ return usingAssertions(clazz,
+ (a, e) -> assertThat(a).isEqualTo(e),
+ (a, e) -> assertThat(a).isEqualTo(e));
+ }
+
+ public static TestMatcher usingFieldsWithIgnoringAssertions(Class clazz, String... fieldsToIgnore) {
+ return usingAssertions(clazz,
+ (a, e) -> assertThat(a).isEqualToIgnoringGivenFields(e, fieldsToIgnore),
+ (a, e) -> assertThat(a).usingElementComparatorIgnoringFields(fieldsToIgnore).isEqualTo(e));
+ }
+
+ public void assertMatch(T actual, T expected) {
+ assertion.accept(actual, expected);
+ }
+
+ @SafeVarargs
+ public final void assertMatch(Iterable actual, T... expected) {
+ assertMatch(actual, List.of(expected));
+ }
+
+ public void assertMatch(Iterable actual, Iterable expected) {
+ iterableAssertion.accept(actual, expected);
+ }
+
+ public ResultMatcher contentJson(T expected) {
+ return result -> assertMatch(TestUtil.readFromJsonMvcResult(result, clazz), expected);
+ }
+
+ @SafeVarargs
+ public final ResultMatcher contentJson(T... expected) {
+ return contentJson(List.of(expected));
+ }
+
+ public ResultMatcher contentJson(Iterable expected) {
+ return result -> assertMatch(readListFromJsonMvcResult(result, clazz), expected);
+ }
+}
diff --git a/src/test/java/ru/javawebinar/topjava/TestUtil.java b/src/test/java/ru/javawebinar/topjava/TestUtil.java
new file mode 100644
index 000000000000..8103c5b08cae
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/TestUtil.java
@@ -0,0 +1,44 @@
+package ru.javawebinar.topjava;
+
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.RequestPostProcessor;
+import ru.javawebinar.topjava.model.User;
+import ru.javawebinar.topjava.web.json.JsonUtil;
+
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+
+public class TestUtil {
+ public static String getContent(MvcResult result) throws UnsupportedEncodingException {
+ return result.getResponse().getContentAsString();
+ }
+
+ public static T readFromJson(ResultActions action, Class clazz) throws UnsupportedEncodingException {
+ return JsonUtil.readValue(getContent(action.andReturn()), clazz);
+ }
+
+ public static T readFromJsonMvcResult(MvcResult result, Class clazz) throws UnsupportedEncodingException {
+ return JsonUtil.readValue(getContent(result), clazz);
+ }
+
+ public static List readListFromJsonMvcResult(MvcResult result, Class clazz) throws UnsupportedEncodingException {
+ return JsonUtil.readValues(getContent(result), clazz);
+ }
+
+ public static void mockAuthorize(User user) {
+ SecurityContextHolder.getContext().setAuthentication(
+ new UsernamePasswordAuthenticationToken(new AuthorizedUser(user), null, user.getRoles()));
+ }
+
+ public static RequestPostProcessor userHttpBasic(User user) {
+ return SecurityMockMvcRequestPostProcessors.httpBasic(user.getEmail(), user.getPassword());
+ }
+
+ public static RequestPostProcessor userAuth(User user) {
+ return SecurityMockMvcRequestPostProcessors.authentication(new UsernamePasswordAuthenticationToken(user.getEmail(), user.getPassword()));
+ }
+}
diff --git a/src/test/java/ru/javawebinar/topjava/TimingExtension.java b/src/test/java/ru/javawebinar/topjava/TimingExtension.java
new file mode 100644
index 000000000000..d2d75becac14
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/TimingExtension.java
@@ -0,0 +1,36 @@
+package ru.javawebinar.topjava;
+
+import org.junit.jupiter.api.extension.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.StopWatch;
+
+public class TimingExtension implements
+ BeforeTestExecutionCallback, AfterTestExecutionCallback, BeforeAllCallback, AfterAllCallback {
+
+ private static final Logger log = LoggerFactory.getLogger("result");
+
+ private StopWatch stopWatch;
+
+ @Override
+ public void beforeAll(ExtensionContext extensionContext) throws Exception {
+ stopWatch = new StopWatch("Execution time of " + extensionContext.getRequiredTestClass().getSimpleName());
+ }
+
+ @Override
+ public void beforeTestExecution(ExtensionContext extensionContext) throws Exception {
+ String testName = extensionContext.getDisplayName();
+ log.info("\nStart " + testName);
+ stopWatch.start(testName);
+ }
+
+ @Override
+ public void afterTestExecution(ExtensionContext extensionContext) throws Exception {
+ stopWatch.stop();
+ }
+
+ @Override
+ public void afterAll(ExtensionContext extensionContext) throws Exception {
+ log.info('\n' + stopWatch.prettyPrint() + '\n');
+ }
+}
diff --git a/src/test/java/ru/javawebinar/topjava/UserTestData.java b/src/test/java/ru/javawebinar/topjava/UserTestData.java
new file mode 100644
index 000000000000..d5c2d1a56c0c
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/UserTestData.java
@@ -0,0 +1,52 @@
+package ru.javawebinar.topjava;
+
+import ru.javawebinar.topjava.model.Role;
+import ru.javawebinar.topjava.model.User;
+import ru.javawebinar.topjava.web.json.JsonUtil;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static ru.javawebinar.topjava.MealTestData.*;
+import static ru.javawebinar.topjava.model.AbstractBaseEntity.START_SEQ;
+
+public class UserTestData {
+ public static TestMatcher USER_MATCHER = TestMatcher.usingFieldsWithIgnoringAssertions(User.class, "registered", "meals", "password");
+ public static TestMatcher USER_WITH_MEALS_MATCHER =
+ TestMatcher.usingAssertions(User.class,
+ (a, e) -> assertThat(a).usingRecursiveComparison()
+ .ignoringFields("registered", "meals.user", "password").ignoringAllOverriddenEquals().isEqualTo(e),
+ (a, e) -> {
+ throw new UnsupportedOperationException();
+ });
+
+ public static final int NOT_FOUND = 10;
+ public static final int USER_ID = START_SEQ;
+ public static final int ADMIN_ID = START_SEQ + 1;
+
+ public static final User USER = new User(USER_ID, "User", "user@yandex.ru", "password", 2005, Role.USER);
+ public static final User ADMIN = new User(ADMIN_ID, "Admin", "admin@gmail.com", "admin", 1900, Role.ADMIN, Role.USER);
+
+ static {
+ USER.setMeals(MEALS);
+ ADMIN.setMeals(List.of(ADMIN_MEAL2, ADMIN_MEAL1));
+ }
+
+ public static User getNew() {
+ return new User(null, "New", "new@gmail.com", "newPass", 1555, false, new Date(), Collections.singleton(Role.USER));
+ }
+
+ public static User getUpdated() {
+ User updated = new User(USER);
+ updated.setName("UpdatedName");
+ updated.setCaloriesPerDay(330);
+ updated.setRoles(Collections.singletonList(Role.ADMIN));
+ return updated;
+ }
+
+ public static String jsonWithPassword(User user, String passw) {
+ return JsonUtil.writeAdditionProps(user, "password", passw);
+ }
+}
diff --git a/src/test/java/ru/javawebinar/topjava/repository/inmemory/InMemoryBaseRepository.java b/src/test/java/ru/javawebinar/topjava/repository/inmemory/InMemoryBaseRepository.java
new file mode 100644
index 000000000000..317bbcabbd1e
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/repository/inmemory/InMemoryBaseRepository.java
@@ -0,0 +1,38 @@
+package ru.javawebinar.topjava.repository.inmemory;
+
+import ru.javawebinar.topjava.model.AbstractBaseEntity;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static ru.javawebinar.topjava.model.AbstractBaseEntity.START_SEQ;
+
+public class InMemoryBaseRepository {
+
+ private static final AtomicInteger counter = new AtomicInteger(START_SEQ);
+
+ final Map map = new ConcurrentHashMap<>();
+
+ public T save(T entry) {
+ if (entry.isNew()) {
+ entry.setId(counter.incrementAndGet());
+ map.put(entry.getId(), entry);
+ return entry;
+ }
+ return map.computeIfPresent(entry.getId(), (id, oldT) -> entry);
+ }
+
+ public boolean delete(int id) {
+ return map.remove(id) != null;
+ }
+
+ public T get(int id) {
+ return map.get(id);
+ }
+
+ Collection getCollection() {
+ return map.values();
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/repository/inmemory/InMemoryMealRepository.java b/src/test/java/ru/javawebinar/topjava/repository/inmemory/InMemoryMealRepository.java
new file mode 100644
index 000000000000..fad599d4dd86
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/repository/inmemory/InMemoryMealRepository.java
@@ -0,0 +1,83 @@
+package ru.javawebinar.topjava.repository.inmemory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Repository;
+import ru.javawebinar.topjava.MealTestData;
+import ru.javawebinar.topjava.UserTestData;
+import ru.javawebinar.topjava.model.Meal;
+import ru.javawebinar.topjava.repository.MealRepository;
+import ru.javawebinar.topjava.util.Util;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+@Repository
+public class InMemoryMealRepository implements MealRepository {
+ private static final Logger log = LoggerFactory.getLogger(InMemoryMealRepository.class);
+
+ // Map userId -> mealRepository
+ private final Map> usersMealsMap = new ConcurrentHashMap<>();
+
+ {
+ var userMeals = new InMemoryBaseRepository();
+ MealTestData.MEALS.forEach(meal -> userMeals.map.put(meal.getId(), meal));
+ usersMealsMap.put(UserTestData.USER_ID, userMeals);
+ }
+
+
+ @Override
+ public Meal save(Meal meal, int userId) {
+ var meals = usersMealsMap.computeIfAbsent(userId, uid -> new InMemoryBaseRepository<>());
+ return meals.save(meal);
+ }
+
+ @PostConstruct
+ public void postConstruct() {
+ log.info("+++ PostConstruct");
+ }
+
+ @PreDestroy
+ public void preDestroy() {
+ log.info("+++ PreDestroy");
+ }
+
+ @Override
+ public boolean delete(int id, int userId) {
+ var meals = usersMealsMap.get(userId);
+ return meals != null && meals.delete(id);
+ }
+
+ @Override
+ public Meal get(int id, int userId) {
+ var meals = usersMealsMap.get(userId);
+ return meals == null ? null : meals.get(id);
+ }
+
+ @Override
+ public List getBetweenHalfOpen(LocalDateTime startDateTime, LocalDateTime endDateTime, int userId) {
+ return filterByPredicate(userId, meal -> Util.isBetweenHalfOpen(meal.getDateTime(), startDateTime, endDateTime));
+ }
+
+ @Override
+ public List getAll(int userId) {
+ return filterByPredicate(userId, meal -> true);
+ }
+
+ private List filterByPredicate(int userId, Predicate filter) {
+ var meals = usersMealsMap.get(userId);
+ return meals == null ? Collections.emptyList() :
+ meals.getCollection().stream()
+ .filter(filter)
+ .sorted(Comparator.comparing(Meal::getDateTime).reversed())
+ .collect(Collectors.toList());
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/repository/inmemory/InMemoryUserRepository.java b/src/test/java/ru/javawebinar/topjava/repository/inmemory/InMemoryUserRepository.java
new file mode 100644
index 000000000000..d08419ab6aa3
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/repository/inmemory/InMemoryUserRepository.java
@@ -0,0 +1,39 @@
+package ru.javawebinar.topjava.repository.inmemory;
+
+import org.springframework.stereotype.Repository;
+import ru.javawebinar.topjava.UserTestData;
+import ru.javawebinar.topjava.model.User;
+import ru.javawebinar.topjava.repository.UserRepository;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static ru.javawebinar.topjava.UserTestData.ADMIN;
+import static ru.javawebinar.topjava.UserTestData.USER;
+
+
+@Repository
+public class InMemoryUserRepository extends InMemoryBaseRepository implements UserRepository {
+
+ public void init() {
+ map.clear();
+ map.put(UserTestData.USER_ID, USER);
+ map.put(UserTestData.ADMIN_ID, ADMIN);
+ }
+
+ @Override
+ public List getAll() {
+ return getCollection().stream()
+ .sorted(Comparator.comparing(User::getName).thenComparing(User::getEmail))
+ .collect(Collectors.toList());
+ }
+
+ @Override
+ public User getByEmail(String email) {
+ return getCollection().stream()
+ .filter(u -> email.equals(u.getEmail()))
+ .findFirst()
+ .orElse(null);
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/service/AbstractMealServiceTest.java b/src/test/java/ru/javawebinar/topjava/service/AbstractMealServiceTest.java
new file mode 100644
index 000000000000..b2d005490e38
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/service/AbstractMealServiceTest.java
@@ -0,0 +1,108 @@
+package ru.javawebinar.topjava.service;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import ru.javawebinar.topjava.model.Meal;
+import ru.javawebinar.topjava.util.exception.ErrorType;
+import ru.javawebinar.topjava.util.exception.NotFoundException;
+
+import javax.validation.ConstraintViolationException;
+import java.time.LocalDate;
+import java.time.Month;
+
+import static java.time.LocalDateTime.of;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static ru.javawebinar.topjava.MealTestData.*;
+import static ru.javawebinar.topjava.UserTestData.ADMIN_ID;
+import static ru.javawebinar.topjava.UserTestData.USER_ID;
+
+public abstract class AbstractMealServiceTest extends AbstractServiceTest {
+
+ @Autowired
+ protected MealService service;
+
+ @Test
+ void delete() throws Exception {
+ service.delete(MEAL1_ID, USER_ID);
+ assertThrows(NotFoundException.class, () -> service.get(MEAL1_ID, USER_ID));
+ }
+
+ @Test
+ void deleteNotFound() throws Exception {
+ assertThrows(NotFoundException.class, () -> service.delete(NOT_FOUND, USER_ID));
+ }
+
+ @Test
+ void deleteNotOwn() throws Exception {
+ assertThrows(NotFoundException.class, () -> service.delete(MEAL1_ID, ADMIN_ID));
+ }
+
+ @Test
+ void create() throws Exception {
+ Meal created = service.create(getNew(), USER_ID);
+ int newId = created.id();
+ Meal newMeal = getNew();
+ newMeal.setId(newId);
+ MEAL_MATCHER.assertMatch(created, newMeal);
+ MEAL_MATCHER.assertMatch(service.get(newId, USER_ID), newMeal);
+ }
+
+ @Test
+ void get() throws Exception {
+ Meal actual = service.get(ADMIN_MEAL_ID, ADMIN_ID);
+ MEAL_MATCHER.assertMatch(actual, ADMIN_MEAL1);
+ }
+
+ @Test
+ void getNotFound() throws Exception {
+ assertThrows(NotFoundException.class, () -> service.get(NOT_FOUND, USER_ID));
+ }
+
+ @Test
+ void getNotOwn() throws Exception {
+ assertThrows(NotFoundException.class, () -> service.get(MEAL1_ID, ADMIN_ID));
+ }
+
+ @Test
+ void update() throws Exception {
+ Meal updated = getUpdated();
+ service.update(updated, USER_ID);
+ MEAL_MATCHER.assertMatch(service.get(MEAL1_ID, USER_ID), getUpdated());
+ }
+
+ @Test
+ void updateNotOwn() throws Exception {
+ NotFoundException exception = assertThrows(NotFoundException.class, () -> service.update(MEAL1, ADMIN_ID));
+ String msg = exception.getMessage();
+ assertTrue(msg.contains(ErrorType.DATA_NOT_FOUND.name()));
+ assertTrue(msg.contains(NotFoundException.NOT_FOUND_EXCEPTION));
+ assertTrue(msg.contains(String.valueOf(MEAL1_ID)));
+ }
+
+ @Test
+ void getAll() throws Exception {
+ MEAL_MATCHER.assertMatch(service.getAll(USER_ID), MEALS);
+ }
+
+ @Test
+ void getBetweenInclusive() throws Exception {
+ MEAL_MATCHER.assertMatch(service.getBetweenInclusive(
+ LocalDate.of(2020, Month.JANUARY, 30),
+ LocalDate.of(2020, Month.JANUARY, 30), USER_ID),
+ MEAL3, MEAL2, MEAL1);
+ }
+
+ @Test
+ void getBetweenWithNullDates() throws Exception {
+ MEAL_MATCHER.assertMatch(service.getBetweenInclusive(null, null, USER_ID), MEALS);
+ }
+
+ @Test
+ void createWithException() throws Exception {
+ validateRootCause(() -> service.create(new Meal(null, of(2015, Month.JUNE, 1, 18, 0), " ", 300), USER_ID), ConstraintViolationException.class);
+ validateRootCause(() -> service.create(new Meal(null, null, "Description", 300), USER_ID), ConstraintViolationException.class);
+ validateRootCause(() -> service.create(new Meal(null, of(2015, Month.JUNE, 1, 18, 0), "Description", 9), USER_ID), ConstraintViolationException.class);
+ validateRootCause(() -> service.create(new Meal(null, of(2015, Month.JUNE, 1, 18, 0), "Description", 5001), USER_ID), ConstraintViolationException.class);
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/service/AbstractServiceTest.java b/src/test/java/ru/javawebinar/topjava/service/AbstractServiceTest.java
new file mode 100644
index 000000000000..9b42af1f21cb
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/service/AbstractServiceTest.java
@@ -0,0 +1,34 @@
+package ru.javawebinar.topjava.service;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.jdbc.Sql;
+import org.springframework.test.context.jdbc.SqlConfig;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import ru.javawebinar.topjava.ActiveDbProfileResolver;
+import ru.javawebinar.topjava.TimingExtension;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static ru.javawebinar.topjava.util.ValidationUtil.getRootCause;
+
+@SpringJUnitConfig(locations = {
+ "classpath:spring/spring-app.xml",
+ "classpath:spring/spring-db.xml"
+})
+//@ExtendWith(SpringExtension.class)
+@ActiveProfiles(resolver = ActiveDbProfileResolver.class)
+@Sql(scripts = "classpath:db/populateDB.sql", config = @SqlConfig(encoding = "UTF-8"))
+@ExtendWith(TimingExtension.class)
+abstract public class AbstractServiceTest {
+
+ // Check root cause in JUnit: https://github.com/junit-team/junit4/pull/778
+ public void validateRootCause(Runnable runnable, Class rootExceptionClass) {
+ assertThrows(rootExceptionClass, () -> {
+ try {
+ runnable.run();
+ } catch (Exception e) {
+ throw getRootCause(e);
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/service/AbstractUserServiceTest.java b/src/test/java/ru/javawebinar/topjava/service/AbstractUserServiceTest.java
new file mode 100644
index 000000000000..5fc6bec55979
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/service/AbstractUserServiceTest.java
@@ -0,0 +1,96 @@
+package ru.javawebinar.topjava.service;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import ru.javawebinar.topjava.model.Role;
+import ru.javawebinar.topjava.model.User;
+import ru.javawebinar.topjava.util.exception.NotFoundException;
+
+import javax.validation.ConstraintViolationException;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static ru.javawebinar.topjava.UserTestData.*;
+
+public abstract class AbstractUserServiceTest extends AbstractServiceTest {
+
+ @Autowired
+ protected UserService service;
+
+ @Test
+ void create() throws Exception {
+ User created = service.create(getNew());
+ int newId = created.id();
+ User newUser = getNew();
+ newUser.setId(newId);
+ USER_MATCHER.assertMatch(created, newUser);
+ USER_MATCHER.assertMatch(service.get(newId), newUser);
+ }
+
+ @Test
+ void duplicateMailCreate() throws Exception {
+ assertThrows(DataAccessException.class, () ->
+ service.create(new User(null, "Duplicate", "user@yandex.ru", "newPass", 2000, Role.USER)));
+ }
+
+ @Test
+ void delete() throws Exception {
+ service.delete(USER_ID);
+ assertThrows(NotFoundException.class, () -> service.get(USER_ID));
+ }
+
+ @Test
+ void deletedNotFound() throws Exception {
+ assertThrows(NotFoundException.class, () -> service.delete(NOT_FOUND));
+ }
+
+ @Test
+ void get() throws Exception {
+ User user = service.get(ADMIN_ID);
+ USER_MATCHER.assertMatch(user, ADMIN);
+ }
+
+ @Test
+ void getNotFound() throws Exception {
+ assertThrows(NotFoundException.class, () -> service.get(NOT_FOUND));
+ }
+
+ @Test
+ void getByEmail() throws Exception {
+ User user = service.getByEmail("admin@gmail.com");
+ USER_MATCHER.assertMatch(user, ADMIN);
+ }
+
+ @Test
+ void update() throws Exception {
+ User updated = getUpdated();
+ service.update(updated);
+ USER_MATCHER.assertMatch(service.get(USER_ID), getUpdated());
+ }
+
+ @Test
+ void getAll() throws Exception {
+ List all = service.getAll();
+ USER_MATCHER.assertMatch(all, ADMIN, USER);
+ }
+
+ @Test
+ void createWithException() throws Exception {
+ validateRootCause(() -> service.create(new User(null, " ", "mail@yandex.ru", "password", 2000, Role.USER)), ConstraintViolationException.class);
+ validateRootCause(() -> service.create(new User(null, "User", " ", "password", 2000, Role.USER)), ConstraintViolationException.class);
+ validateRootCause(() -> service.create(new User(null, "User", "mail@yandex.ru", " ", 2000, Role.USER)), ConstraintViolationException.class);
+ validateRootCause(() -> service.create(new User(null, "User", "mail@yandex.ru", "password", 9, true, new Date(), Set.of())), ConstraintViolationException.class);
+ validateRootCause(() -> service.create(new User(null, "User", "mail@yandex.ru", "password", 10001, true, new Date(), Set.of())), ConstraintViolationException.class);
+ }
+
+ @Test
+ void enable() {
+ service.enable(USER_ID, false);
+ assertFalse(service.get(USER_ID).isEnabled());
+ service.enable(USER_ID, true);
+ assertTrue(service.get(USER_ID).isEnabled());
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/service/datajpa/DataJpaMealServiceTest.java b/src/test/java/ru/javawebinar/topjava/service/datajpa/DataJpaMealServiceTest.java
new file mode 100644
index 000000000000..2d66bd0ec3c3
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/service/datajpa/DataJpaMealServiceTest.java
@@ -0,0 +1,29 @@
+package ru.javawebinar.topjava.service.datajpa;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.ActiveProfiles;
+import ru.javawebinar.topjava.UserTestData;
+import ru.javawebinar.topjava.model.Meal;
+import ru.javawebinar.topjava.service.AbstractMealServiceTest;
+import ru.javawebinar.topjava.util.exception.NotFoundException;
+
+import static ru.javawebinar.topjava.MealTestData.*;
+import static ru.javawebinar.topjava.Profiles.DATAJPA;
+import static ru.javawebinar.topjava.UserTestData.ADMIN_ID;
+
+@ActiveProfiles(DATAJPA)
+class DataJpaMealServiceTest extends AbstractMealServiceTest {
+ @Test
+ void getWithUser() throws Exception {
+ Meal adminMeal = service.getWithUser(ADMIN_MEAL_ID, ADMIN_ID);
+ MEAL_MATCHER.assertMatch(adminMeal, ADMIN_MEAL1);
+ UserTestData.USER_MATCHER.assertMatch(adminMeal.getUser(), UserTestData.ADMIN);
+ }
+
+ @Test
+ void getWithUserNotFound() throws Exception {
+ Assertions.assertThrows(NotFoundException.class,
+ () -> service.getWithUser(1, ADMIN_ID));
+ }
+}
diff --git a/src/test/java/ru/javawebinar/topjava/service/datajpa/DataJpaUserServiceTest.java b/src/test/java/ru/javawebinar/topjava/service/datajpa/DataJpaUserServiceTest.java
new file mode 100644
index 000000000000..feb99f59b920
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/service/datajpa/DataJpaUserServiceTest.java
@@ -0,0 +1,26 @@
+package ru.javawebinar.topjava.service.datajpa;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.context.ActiveProfiles;
+import ru.javawebinar.topjava.model.User;
+import ru.javawebinar.topjava.service.AbstractUserServiceTest;
+import ru.javawebinar.topjava.util.exception.NotFoundException;
+
+import static ru.javawebinar.topjava.Profiles.DATAJPA;
+import static ru.javawebinar.topjava.UserTestData.*;
+
+@ActiveProfiles(DATAJPA)
+class DataJpaUserServiceTest extends AbstractUserServiceTest {
+ @Test
+ void getWithMeals() throws Exception {
+ User admin = service.getWithMeals(ADMIN_ID);
+ USER_WITH_MEALS_MATCHER.assertMatch(admin, ADMIN);
+ }
+
+ @Test
+ void getWithMealsNotFound() throws Exception {
+ Assertions.assertThrows(NotFoundException.class,
+ () -> service.getWithMeals(1));
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/service/jdbc/JdbcMealServiceTest.java b/src/test/java/ru/javawebinar/topjava/service/jdbc/JdbcMealServiceTest.java
new file mode 100644
index 000000000000..aef588264f71
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/service/jdbc/JdbcMealServiceTest.java
@@ -0,0 +1,10 @@
+package ru.javawebinar.topjava.service.jdbc;
+
+import org.springframework.test.context.ActiveProfiles;
+import ru.javawebinar.topjava.service.AbstractMealServiceTest;
+
+import static ru.javawebinar.topjava.Profiles.JDBC;
+
+@ActiveProfiles(JDBC)
+class JdbcMealServiceTest extends AbstractMealServiceTest {
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/service/jdbc/JdbcUserServiceTest.java b/src/test/java/ru/javawebinar/topjava/service/jdbc/JdbcUserServiceTest.java
new file mode 100644
index 000000000000..62ca7668cf67
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/service/jdbc/JdbcUserServiceTest.java
@@ -0,0 +1,10 @@
+package ru.javawebinar.topjava.service.jdbc;
+
+import org.springframework.test.context.ActiveProfiles;
+import ru.javawebinar.topjava.service.AbstractUserServiceTest;
+
+import static ru.javawebinar.topjava.Profiles.JDBC;
+
+@ActiveProfiles(JDBC)
+class JdbcUserServiceTest extends AbstractUserServiceTest {
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/service/jpa/JpaMealServiceTest.java b/src/test/java/ru/javawebinar/topjava/service/jpa/JpaMealServiceTest.java
new file mode 100644
index 000000000000..aaf5dcda960e
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/service/jpa/JpaMealServiceTest.java
@@ -0,0 +1,10 @@
+package ru.javawebinar.topjava.service.jpa;
+
+import org.springframework.test.context.ActiveProfiles;
+import ru.javawebinar.topjava.service.AbstractMealServiceTest;
+
+import static ru.javawebinar.topjava.Profiles.JPA;
+
+@ActiveProfiles(JPA)
+class JpaMealServiceTest extends AbstractMealServiceTest {
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/service/jpa/JpaUserServiceTest.java b/src/test/java/ru/javawebinar/topjava/service/jpa/JpaUserServiceTest.java
new file mode 100644
index 000000000000..6d1cd91543fc
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/service/jpa/JpaUserServiceTest.java
@@ -0,0 +1,10 @@
+package ru.javawebinar.topjava.service.jpa;
+
+import org.springframework.test.context.ActiveProfiles;
+import ru.javawebinar.topjava.service.AbstractUserServiceTest;
+
+import static ru.javawebinar.topjava.Profiles.JPA;
+
+@ActiveProfiles(JPA)
+class JpaUserServiceTest extends AbstractUserServiceTest {
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/web/AbstractControllerTest.java b/src/test/java/ru/javawebinar/topjava/web/AbstractControllerTest.java
new file mode 100644
index 000000000000..c2f057f8342c
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/web/AbstractControllerTest.java
@@ -0,0 +1,84 @@
+package ru.javawebinar.topjava.web;
+
+import org.junit.jupiter.api.Assumptions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.support.MessageSourceAccessor;
+import org.springframework.core.env.Environment;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit.jupiter.web.SpringJUnitWebConfig;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.ResultMatcher;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.filter.CharacterEncodingFilter;
+import ru.javawebinar.topjava.AllActiveProfileResolver;
+import ru.javawebinar.topjava.Profiles;
+import ru.javawebinar.topjava.util.exception.ErrorType;
+
+import javax.annotation.PostConstruct;
+import java.util.Locale;
+
+import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+
+@SpringJUnitWebConfig(locations = {
+ "classpath:spring/spring-app.xml",
+ "classpath:spring/spring-mvc.xml",
+ "classpath:spring/spring-db.xml"
+})
+//@WebAppConfiguration
+//@ExtendWith(SpringExtension.class)
+@Transactional
+@ActiveProfiles(resolver = AllActiveProfileResolver.class)
+abstract public class AbstractControllerTest {
+ private static final Locale RU_LOCALE = new Locale("ru");
+ private static final CharacterEncodingFilter CHARACTER_ENCODING_FILTER = new CharacterEncodingFilter();
+
+ @Autowired
+ public Environment env;
+
+ @Autowired
+ protected MessageSourceAccessor messageSourceAccessor;
+
+ static {
+ CHARACTER_ENCODING_FILTER.setEncoding("UTF-8");
+ CHARACTER_ENCODING_FILTER.setForceEncoding(true);
+ }
+
+ private MockMvc mockMvc;
+
+ @Autowired
+ private WebApplicationContext webApplicationContext;
+
+ public void assumeDataJpa() {
+ Assumptions.assumeTrue(env.acceptsProfiles(org.springframework.core.env.Profiles.of(Profiles.DATAJPA)), "DATA-JPA only");
+ }
+
+ @PostConstruct
+ private void postConstruct() {
+ mockMvc = MockMvcBuilders
+ .webAppContextSetup(webApplicationContext)
+ .addFilter(CHARACTER_ENCODING_FILTER)
+ .apply(springSecurity())
+ .build();
+ }
+
+ public ResultActions perform(MockHttpServletRequestBuilder builder) throws Exception {
+ return mockMvc.perform(builder);
+ }
+
+ private String getMessage(String code) {
+ return messageSourceAccessor.getMessage(code, RU_LOCALE);
+ }
+
+ public ResultMatcher errorType(ErrorType type) {
+ return jsonPath("$.type").value(type.name());
+ }
+
+ public ResultMatcher detailMessage(String code) {
+ return jsonPath("$.details").value(getMessage(code));
+ }
+}
diff --git a/src/test/java/ru/javawebinar/topjava/web/ResourceControllerTest.java b/src/test/java/ru/javawebinar/topjava/web/ResourceControllerTest.java
new file mode 100644
index 000000000000..550ed9cef0b5
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/web/ResourceControllerTest.java
@@ -0,0 +1,20 @@
+package ru.javawebinar.topjava.web;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.http.MediaType;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+class ResourceControllerTest extends AbstractControllerTest {
+
+ @Test
+ void resources() throws Exception {
+ perform(get("/resources/css/style.css"))
+ .andDo(print())
+ .andExpect(content().contentType(MediaType.valueOf("text/css")))
+ .andExpect(status().isOk());
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/web/RootControllerTest.java b/src/test/java/ru/javawebinar/topjava/web/RootControllerTest.java
new file mode 100644
index 000000000000..0f2fe659d637
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/web/RootControllerTest.java
@@ -0,0 +1,41 @@
+package ru.javawebinar.topjava.web;
+
+import org.junit.jupiter.api.Test;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static ru.javawebinar.topjava.TestUtil.userAuth;
+import static ru.javawebinar.topjava.UserTestData.ADMIN;
+import static ru.javawebinar.topjava.UserTestData.USER;
+
+class RootControllerTest extends AbstractControllerTest {
+
+ @Test
+ void getUsers() throws Exception {
+ perform(get("/users")
+ .with(userAuth(ADMIN)))
+ .andDo(print())
+ .andExpect(status().isOk())
+ .andExpect(view().name("users"))
+ .andExpect(forwardedUrl("/WEB-INF/jsp/users.jsp"));
+ }
+
+ @Test
+ void unAuth() throws Exception {
+ perform(get("/users"))
+ .andDo(print())
+ .andExpect(status().is3xxRedirection())
+ .andExpect(redirectedUrl("http://localhost/login"));
+ }
+
+ @Test
+ void getMeals() throws Exception {
+ perform(get("/meals")
+ .with(userAuth(USER)))
+ .andDo(print())
+ .andExpect(status().isOk())
+ .andExpect(view().name("meals"))
+ .andExpect(forwardedUrl("/WEB-INF/jsp/meals.jsp"));
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/web/json/JsonUtilTest.java b/src/test/java/ru/javawebinar/topjava/web/json/JsonUtilTest.java
new file mode 100644
index 000000000000..af301c1c7178
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/web/json/JsonUtilTest.java
@@ -0,0 +1,44 @@
+package ru.javawebinar.topjava.web.json;
+
+import org.junit.jupiter.api.Test;
+import ru.javawebinar.topjava.UserTestData;
+import ru.javawebinar.topjava.model.Meal;
+import ru.javawebinar.topjava.model.User;
+
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static ru.javawebinar.topjava.MealTestData.*;
+
+class JsonUtilTest {
+
+ @Test
+ void readWriteValue() throws Exception {
+ String json = JsonUtil.writeValue(ADMIN_MEAL1);
+ System.out.println(json);
+ Meal meal = JsonUtil.readValue(json, Meal.class);
+ MEAL_MATCHER.assertMatch(meal, ADMIN_MEAL1);
+ }
+
+ @Test
+ void readWriteValues() throws Exception {
+ String json = JsonUtil.writeValue(MEALS);
+ System.out.println(json);
+ List meals = JsonUtil.readValues(json, Meal.class);
+ MEAL_MATCHER.assertMatch(meals, MEALS);
+ }
+
+ @Test
+ void writeOnlyAccess() throws Exception {
+ String json = JsonUtil.writeValue(UserTestData.USER);
+ System.out.println(json);
+ assertThat(json, not(containsString("password")));
+ String jsonWithPass = UserTestData.jsonWithPassword(UserTestData.USER, "newPass");
+ System.out.println(jsonWithPass);
+ User user = JsonUtil.readValue(jsonWithPass, User.class);
+ assertEquals(user.getPassword(), "newPass");
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/web/meal/MealRestControllerTest.java b/src/test/java/ru/javawebinar/topjava/web/meal/MealRestControllerTest.java
new file mode 100644
index 000000000000..9ccd54c768b5
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/web/meal/MealRestControllerTest.java
@@ -0,0 +1,197 @@
+package ru.javawebinar.topjava.web.meal;
+
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import ru.javawebinar.topjava.MealTestData;
+import ru.javawebinar.topjava.model.Meal;
+import ru.javawebinar.topjava.service.MealService;
+import ru.javawebinar.topjava.util.exception.NotFoundException;
+import ru.javawebinar.topjava.web.AbstractControllerTest;
+import ru.javawebinar.topjava.web.json.JsonUtil;
+
+import java.time.LocalDateTime;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static ru.javawebinar.topjava.MealTestData.*;
+import static ru.javawebinar.topjava.TestUtil.readFromJson;
+import static ru.javawebinar.topjava.TestUtil.userHttpBasic;
+import static ru.javawebinar.topjava.UserTestData.*;
+import static ru.javawebinar.topjava.util.MealsUtil.createTo;
+import static ru.javawebinar.topjava.util.MealsUtil.getTos;
+import static ru.javawebinar.topjava.util.exception.ErrorType.VALIDATION_ERROR;
+import static ru.javawebinar.topjava.web.ExceptionInfoHandler.EXCEPTION_DUPLICATE_DATETIME;
+
+class MealRestControllerTest extends AbstractControllerTest {
+
+ private static final String REST_URL = MealRestController.REST_URL + '/';
+
+ @Autowired
+ private MealService mealService;
+
+ @Test
+ void get() throws Exception {
+ perform(MockMvcRequestBuilders.get(REST_URL + MEAL1_ID)
+ .with(userHttpBasic(USER)))
+ .andExpect(status().isOk())
+ .andDo(print())
+ .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
+ .andExpect(MEAL_MATCHER.contentJson(MEAL1));
+ }
+
+ @Test
+ void getUnauth() throws Exception {
+ perform(MockMvcRequestBuilders.get(REST_URL + MEAL1_ID))
+ .andExpect(status().isUnauthorized());
+ }
+
+ @Test
+ void getNotFound() throws Exception {
+ perform(MockMvcRequestBuilders.get(REST_URL + ADMIN_MEAL_ID)
+ .with(userHttpBasic(USER)))
+ .andDo(print())
+ .andExpect(status().isUnprocessableEntity());
+ }
+
+ @Test
+ void delete() throws Exception {
+ perform(MockMvcRequestBuilders.delete(REST_URL + MEAL1_ID)
+ .with(userHttpBasic(USER)))
+ .andExpect(status().isNoContent());
+ assertThrows(NotFoundException.class, () -> mealService.get(MEAL1_ID, USER_ID));
+ }
+
+ @Test
+ void deleteNotFound() throws Exception {
+ perform(MockMvcRequestBuilders.delete(REST_URL + ADMIN_MEAL_ID)
+ .with(userHttpBasic(USER)))
+ .andExpect(status().isUnprocessableEntity());
+ }
+
+ @Test
+ void update() throws Exception {
+ Meal updated = MealTestData.getUpdated();
+ perform(MockMvcRequestBuilders.put(REST_URL + MEAL1_ID).contentType(MediaType.APPLICATION_JSON)
+ .content(JsonUtil.writeValue(updated))
+ .with(userHttpBasic(USER)))
+ .andExpect(status().isNoContent());
+
+ MEAL_MATCHER.assertMatch(mealService.get(MEAL1_ID, USER_ID), updated);
+ }
+
+ @Test
+ void createWithLocation() throws Exception {
+ Meal newMeal = MealTestData.getNew();
+ ResultActions action = perform(MockMvcRequestBuilders.post(REST_URL)
+ .contentType(MediaType.APPLICATION_JSON)
+ .content(JsonUtil.writeValue(newMeal))
+ .with(userHttpBasic(USER)));
+
+ Meal created = readFromJson(action, Meal.class);
+ int newId = created.id();
+ newMeal.setId(newId);
+ MEAL_MATCHER.assertMatch(created, newMeal);
+ MEAL_MATCHER.assertMatch(mealService.get(newId, USER_ID), newMeal);
+ }
+
+ @Test
+ void getAll() throws Exception {
+ perform(MockMvcRequestBuilders.get(REST_URL)
+ .with(userHttpBasic(USER)))
+ .andExpect(status().isOk())
+ .andDo(print())
+ .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
+ .andExpect(MEAL_TO_MATCHER.contentJson(getTos(MEALS, USER.getCaloriesPerDay())));
+ }
+
+ @Test
+ void filter() throws Exception {
+ perform(MockMvcRequestBuilders.get(REST_URL + "filter")
+ .param("startDate", "2020-01-30").param("startTime", "07:00")
+ .param("endDate", "2020-01-31").param("endTime", "11:00")
+ .with(userHttpBasic(USER)))
+ .andDo(print())
+ .andExpect(status().isOk())
+ .andExpect(MEAL_TO_MATCHER.contentJson(createTo(MEAL5, true), createTo(MEAL1, false)));
+ }
+
+ @Test
+ void filterAll() throws Exception {
+ perform(MockMvcRequestBuilders.get(REST_URL + "filter?startDate=&endTime=")
+ .with(userHttpBasic(USER)))
+ .andExpect(status().isOk())
+ .andExpect(MEAL_TO_MATCHER.contentJson(getTos(MEALS, USER.getCaloriesPerDay())));
+ }
+
+ @Test
+ void createInvalid() throws Exception {
+ Meal invalid = new Meal(null, null, "Dummy", 200);
+ perform(MockMvcRequestBuilders.post(REST_URL)
+ .contentType(MediaType.APPLICATION_JSON)
+ .content(JsonUtil.writeValue(invalid))
+ .with(userHttpBasic(ADMIN)))
+ .andDo(print())
+ .andExpect(status().isUnprocessableEntity())
+ .andExpect(errorType(VALIDATION_ERROR));
+ }
+
+ @Test
+ void updateInvalid() throws Exception {
+ Meal invalid = new Meal(MEAL1_ID, null, null, 6000);
+ perform(MockMvcRequestBuilders.put(REST_URL + MEAL1_ID)
+ .contentType(MediaType.APPLICATION_JSON)
+ .content(JsonUtil.writeValue(invalid))
+ .with(userHttpBasic(USER)))
+ .andDo(print())
+ .andExpect(status().isUnprocessableEntity())
+ .andExpect(errorType(VALIDATION_ERROR));
+ }
+
+ @Test
+ @Transactional(propagation = Propagation.NEVER)
+ void updateDuplicate() throws Exception {
+ Meal invalid = new Meal(MEAL1_ID, MEAL2.getDateTime(), "Dummy", 200);
+ perform(MockMvcRequestBuilders.put(REST_URL + MEAL1_ID)
+ .contentType(MediaType.APPLICATION_JSON)
+ .content(JsonUtil.writeValue(invalid))
+ .with(userHttpBasic(USER)))
+ .andDo(print())
+ .andExpect(status().isConflict())
+ .andExpect(errorType(VALIDATION_ERROR))
+ .andExpect(detailMessage(EXCEPTION_DUPLICATE_DATETIME));
+ }
+
+ @Test
+ @Transactional(propagation = Propagation.NEVER)
+ void createDuplicate() throws Exception {
+ Meal invalid = new Meal(null, ADMIN_MEAL1.getDateTime(), "Dummy", 200);
+ perform(MockMvcRequestBuilders.post(REST_URL)
+ .contentType(MediaType.APPLICATION_JSON)
+ .content(JsonUtil.writeValue(invalid))
+ .with(userHttpBasic(ADMIN)))
+ .andDo(print())
+ .andExpect(status().isConflict())
+ .andExpect(errorType(VALIDATION_ERROR))
+ .andExpect(detailMessage(EXCEPTION_DUPLICATE_DATETIME));
+ }
+
+ @Test
+ void updateHtmlUnsafe() throws Exception {
+ Meal invalid = new Meal(MEAL1_ID, LocalDateTime.now(), "", 200);
+ perform(MockMvcRequestBuilders.put(REST_URL + MEAL1_ID)
+ .contentType(MediaType.APPLICATION_JSON)
+ .content(JsonUtil.writeValue(invalid))
+ .with(userHttpBasic(USER)))
+ .andDo(print())
+ .andExpect(status().isUnprocessableEntity())
+ .andExpect(errorType(VALIDATION_ERROR));
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/web/user/AdminRestControllerTest.java b/src/test/java/ru/javawebinar/topjava/web/user/AdminRestControllerTest.java
new file mode 100644
index 000000000000..79419f684c68
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/web/user/AdminRestControllerTest.java
@@ -0,0 +1,207 @@
+package ru.javawebinar.topjava.web.user;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import ru.javawebinar.topjava.UserTestData;
+import ru.javawebinar.topjava.model.Role;
+import ru.javawebinar.topjava.model.User;
+import ru.javawebinar.topjava.service.UserService;
+import ru.javawebinar.topjava.util.exception.NotFoundException;
+import ru.javawebinar.topjava.web.AbstractControllerTest;
+import ru.javawebinar.topjava.web.json.JsonUtil;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static ru.javawebinar.topjava.TestUtil.readFromJson;
+import static ru.javawebinar.topjava.TestUtil.userHttpBasic;
+import static ru.javawebinar.topjava.UserTestData.*;
+import static ru.javawebinar.topjava.util.exception.ErrorType.VALIDATION_ERROR;
+import static ru.javawebinar.topjava.web.ExceptionInfoHandler.EXCEPTION_DUPLICATE_EMAIL;
+
+class AdminRestControllerTest extends AbstractControllerTest {
+
+ private static final String REST_URL = AdminRestController.REST_URL + '/';
+
+ @Autowired
+ private UserService userService;
+
+ @Test
+ void get() throws Exception {
+ perform(MockMvcRequestBuilders.get(REST_URL + ADMIN_ID)
+ .with(userHttpBasic(ADMIN)))
+ .andExpect(status().isOk())
+ .andDo(print())
+ // https://jira.spring.io/browse/SPR-14472
+ .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
+ .andExpect(USER_MATCHER.contentJson(ADMIN));
+ }
+
+ @Test
+ void getNotFound() throws Exception {
+ perform(MockMvcRequestBuilders.get(REST_URL + 1)
+ .with(userHttpBasic(ADMIN)))
+ .andDo(print())
+ .andExpect(status().isUnprocessableEntity());
+ }
+
+ @Test
+ void getByEmail() throws Exception {
+ perform(MockMvcRequestBuilders.get(REST_URL + "by?email=" + ADMIN.getEmail())
+ .with(userHttpBasic(ADMIN)))
+ .andExpect(status().isOk())
+ .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
+ .andExpect(USER_MATCHER.contentJson(ADMIN));
+ }
+
+ @Test
+ void delete() throws Exception {
+ perform(MockMvcRequestBuilders.delete(REST_URL + USER_ID)
+ .with(userHttpBasic(ADMIN)))
+ .andDo(print())
+ .andExpect(status().isNoContent());
+ assertThrows(NotFoundException.class, () -> userService.get(USER_ID));
+ }
+
+ @Test
+ void deleteNotFound() throws Exception {
+ perform(MockMvcRequestBuilders.delete(REST_URL + 1)
+ .with(userHttpBasic(ADMIN)))
+ .andExpect(status().isUnprocessableEntity())
+ .andDo(print());
+ }
+
+ @Test
+ void getUnAuth() throws Exception {
+ perform(MockMvcRequestBuilders.get(REST_URL))
+ .andExpect(status().isUnauthorized());
+ }
+
+ @Test
+ void getForbidden() throws Exception {
+ perform(MockMvcRequestBuilders.get(REST_URL)
+ .with(userHttpBasic(USER)))
+ .andExpect(status().isForbidden());
+ }
+
+ @Test
+ void update() throws Exception {
+ User updated = getUpdated();
+ updated.setId(null);
+ perform(MockMvcRequestBuilders.put(REST_URL + USER_ID)
+ .contentType(MediaType.APPLICATION_JSON)
+ .with(userHttpBasic(ADMIN))
+ .content(UserTestData.jsonWithPassword(updated, "newPass")))
+ .andExpect(status().isNoContent());
+
+ USER_MATCHER.assertMatch(userService.get(USER_ID), getUpdated());
+ }
+
+ @Test
+ void createWithLocation() throws Exception {
+ User newUser = getNew();
+ ResultActions action = perform(MockMvcRequestBuilders.post(REST_URL)
+ .contentType(MediaType.APPLICATION_JSON)
+ .with(userHttpBasic(ADMIN))
+ .content(UserTestData.jsonWithPassword(newUser, "newPass")))
+ .andExpect(status().isCreated());
+
+ User created = readFromJson(action, User.class);
+ int newId = created.id();
+ newUser.setId(newId);
+ USER_MATCHER.assertMatch(created, newUser);
+ USER_MATCHER.assertMatch(userService.get(newId), newUser);
+ }
+
+ @Test
+ void getAll() throws Exception {
+ perform(MockMvcRequestBuilders.get(REST_URL)
+ .with(userHttpBasic(ADMIN)))
+ .andExpect(status().isOk())
+ .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
+ .andExpect(USER_MATCHER.contentJson(ADMIN, USER));
+ }
+
+ @Test
+ void enable() throws Exception {
+ perform(MockMvcRequestBuilders.patch(REST_URL + USER_ID)
+ .param("enabled", "false")
+ .contentType(MediaType.APPLICATION_JSON)
+ .with(userHttpBasic(ADMIN)))
+ .andDo(print())
+ .andExpect(status().isNoContent());
+
+ assertFalse(userService.get(USER_ID).isEnabled());
+ }
+
+ @Test
+ void getWithMeals() throws Exception {
+ assumeDataJpa();
+ perform(MockMvcRequestBuilders.get(REST_URL + ADMIN_ID + "/with-meals")
+ .with(userHttpBasic(ADMIN)))
+ .andExpect(status().isOk())
+ .andDo(print())
+ .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
+ .andExpect(USER_WITH_MEALS_MATCHER.contentJson(ADMIN));
+ }
+
+ @Test
+ void createInvalid() throws Exception {
+ User expected = new User(null, null, "", "newPass", 7300, Role.USER, Role.ADMIN);
+ perform(MockMvcRequestBuilders.post(REST_URL)
+ .contentType(MediaType.APPLICATION_JSON)
+ .with(userHttpBasic(ADMIN))
+ .content(JsonUtil.writeValue(expected)))
+ .andExpect(status().isUnprocessableEntity())
+ .andExpect(errorType(VALIDATION_ERROR))
+ .andDo(print());
+ }
+
+ @Test
+ void updateInvalid() throws Exception {
+ User updated = new User(USER);
+ updated.setName("");
+ perform(MockMvcRequestBuilders.put(REST_URL + USER_ID)
+ .contentType(MediaType.APPLICATION_JSON)
+ .with(userHttpBasic(ADMIN))
+ .content(JsonUtil.writeValue(updated)))
+ .andExpect(status().isUnprocessableEntity())
+ .andDo(print())
+ .andExpect(errorType(VALIDATION_ERROR));
+ }
+
+ @Test
+ @Transactional(propagation = Propagation.NEVER)
+ void updateDuplicate() throws Exception {
+ User updated = new User(USER);
+ updated.setEmail("admin@gmail.com");
+ perform(MockMvcRequestBuilders.put(REST_URL + USER_ID)
+ .contentType(MediaType.APPLICATION_JSON)
+ .with(userHttpBasic(ADMIN))
+ .content(jsonWithPassword(updated, "password")))
+ .andExpect(status().isUnprocessableEntity())
+ .andExpect(errorType(VALIDATION_ERROR))
+ .andExpect(detailMessage(EXCEPTION_DUPLICATE_EMAIL))
+ .andDo(print());
+ }
+
+ @Test
+ @Transactional(propagation = Propagation.NEVER)
+ void createDuplicate() throws Exception {
+ User expected = new User(null, "New", "user@yandex.ru", "newPass", 2300, Role.USER, Role.ADMIN);
+ perform(MockMvcRequestBuilders.post(REST_URL)
+ .contentType(MediaType.APPLICATION_JSON)
+ .with(userHttpBasic(ADMIN))
+ .content(jsonWithPassword(expected, "newPass")))
+ .andExpect(status().isUnprocessableEntity())
+ .andExpect(errorType(VALIDATION_ERROR))
+ .andExpect(detailMessage(EXCEPTION_DUPLICATE_EMAIL));
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/web/user/HerokuRestControllerTest.java b/src/test/java/ru/javawebinar/topjava/web/user/HerokuRestControllerTest.java
new file mode 100644
index 000000000000..defa88ff71bd
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/web/user/HerokuRestControllerTest.java
@@ -0,0 +1,65 @@
+package ru.javawebinar.topjava.web.user;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.ResourcePropertySource;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import ru.javawebinar.topjava.UserTestData;
+import ru.javawebinar.topjava.util.exception.ErrorType;
+import ru.javawebinar.topjava.web.AbstractControllerTest;
+
+import java.io.IOException;
+
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static ru.javawebinar.topjava.Profiles.HEROKU;
+import static ru.javawebinar.topjava.TestUtil.userHttpBasic;
+import static ru.javawebinar.topjava.UserTestData.*;
+import static ru.javawebinar.topjava.util.exception.ModificationRestrictionException.EXCEPTION_MODIFICATION_RESTRICTION;
+
+@ActiveProfiles({HEROKU})
+class HerokuRestControllerTest extends AbstractControllerTest {
+
+ private static final String REST_URL = AdminRestController.REST_URL + '/';
+
+ // Set DATABASE_URL environment for heroku profile
+ static {
+ Resource resource = new ClassPathResource("db/postgres.properties");
+ try {
+ ResourcePropertySource propertySource = new ResourcePropertySource(resource);
+ String herokuDbUrl = String.format("postgres://%s:%s@%s",
+ propertySource.getProperty("database.username"),
+ propertySource.getProperty("database.password"),
+ ((String) propertySource.getProperty("database.url")).substring(18));
+ System.out.println(herokuDbUrl);
+
+ System.setProperty("DATABASE_URL", herokuDbUrl);
+ } catch (IOException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
+ @Test
+ void delete() throws Exception {
+ perform(MockMvcRequestBuilders.delete(REST_URL + USER_ID)
+ .with(userHttpBasic(ADMIN)))
+ .andDo(print())
+ .andExpect(errorType(ErrorType.VALIDATION_ERROR))
+ .andExpect(detailMessage(EXCEPTION_MODIFICATION_RESTRICTION))
+ .andExpect(status().isUnprocessableEntity());
+ }
+
+ @Test
+ void update() throws Exception {
+ perform(MockMvcRequestBuilders.put(REST_URL + USER_ID)
+ .contentType(MediaType.APPLICATION_JSON)
+ .with(userHttpBasic(ADMIN))
+ .content(UserTestData.jsonWithPassword(USER, "password")))
+ .andExpect(errorType(ErrorType.VALIDATION_ERROR))
+ .andExpect(detailMessage(EXCEPTION_MODIFICATION_RESTRICTION))
+ .andExpect(status().isUnprocessableEntity());
+ }
+}
diff --git a/src/test/java/ru/javawebinar/topjava/web/user/InMemoryAdminRestControllerSpringTest.java b/src/test/java/ru/javawebinar/topjava/web/user/InMemoryAdminRestControllerSpringTest.java
new file mode 100644
index 000000000000..21bfd53b15fe
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/web/user/InMemoryAdminRestControllerSpringTest.java
@@ -0,0 +1,38 @@
+package ru.javawebinar.topjava.web.user;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import ru.javawebinar.topjava.repository.inmemory.InMemoryUserRepository;
+import ru.javawebinar.topjava.util.exception.NotFoundException;
+
+import static ru.javawebinar.topjava.UserTestData.NOT_FOUND;
+import static ru.javawebinar.topjava.UserTestData.USER_ID;
+
+@SpringJUnitConfig(locations = {"classpath:spring/inmemory.xml"})
+class InMemoryAdminRestControllerSpringTest {
+
+ @Autowired
+ private AdminRestController controller;
+
+ @Autowired
+ private InMemoryUserRepository repository;
+
+ @BeforeEach
+ void setup() throws Exception {
+ repository.init();
+ }
+
+ @Test
+ void delete() throws Exception {
+ controller.delete(USER_ID);
+ Assertions.assertNull(repository.get(USER_ID));
+ }
+
+ @Test
+ void deleteNotFound() throws Exception {
+ Assertions.assertThrows(NotFoundException.class, () -> controller.delete(NOT_FOUND));
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/web/user/InMemoryAdminRestControllerTest.java b/src/test/java/ru/javawebinar/topjava/web/user/InMemoryAdminRestControllerTest.java
new file mode 100644
index 000000000000..3064da4993e0
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/web/user/InMemoryAdminRestControllerTest.java
@@ -0,0 +1,54 @@
+package ru.javawebinar.topjava.web.user;
+
+import org.junit.jupiter.api.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import ru.javawebinar.topjava.repository.inmemory.InMemoryUserRepository;
+import ru.javawebinar.topjava.util.exception.NotFoundException;
+
+import java.util.Arrays;
+
+import static ru.javawebinar.topjava.UserTestData.NOT_FOUND;
+import static ru.javawebinar.topjava.UserTestData.USER_ID;
+
+class InMemoryAdminRestControllerTest {
+ private static final Logger log = LoggerFactory.getLogger(InMemoryAdminRestControllerTest.class);
+
+ private static ConfigurableApplicationContext appCtx;
+ private static AdminRestController controller;
+ private static InMemoryUserRepository repository;
+
+ @BeforeAll
+ static void beforeClass() {
+ appCtx = new ClassPathXmlApplicationContext("spring/inmemory.xml");
+ log.info("\n{}\n", Arrays.toString(appCtx.getBeanDefinitionNames()));
+ controller = appCtx.getBean(AdminRestController.class);
+ repository = appCtx.getBean(InMemoryUserRepository.class);
+ }
+
+ @AfterAll
+ static void afterClass() {
+// May cause during JUnit "Cache is not alive (STATUS_SHUTDOWN)" as JUnit share Spring context for speed
+// http://stackoverflow.com/questions/16281802/ehcache-shutdown-causing-an-exception-while-running-test-suite
+// appCtx.close();
+ }
+
+ @BeforeEach
+ void setup() throws Exception {
+ // re-initialize
+ repository.init();
+ }
+
+ @Test
+ void delete() throws Exception {
+ controller.delete(USER_ID);
+ Assertions.assertNull(repository.get(USER_ID));
+ }
+
+ @Test
+ public void deleteNotFound() throws Exception {
+ Assertions.assertThrows(NotFoundException.class, () -> controller.delete(NOT_FOUND));
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/ru/javawebinar/topjava/web/user/ProfileRestControllerTest.java b/src/test/java/ru/javawebinar/topjava/web/user/ProfileRestControllerTest.java
new file mode 100644
index 000000000000..19e5b53d5bb8
--- /dev/null
+++ b/src/test/java/ru/javawebinar/topjava/web/user/ProfileRestControllerTest.java
@@ -0,0 +1,119 @@
+package ru.javawebinar.topjava.web.user;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.ResultActions;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import ru.javawebinar.topjava.model.User;
+import ru.javawebinar.topjava.service.UserService;
+import ru.javawebinar.topjava.to.UserTo;
+import ru.javawebinar.topjava.util.UserUtil;
+import ru.javawebinar.topjava.web.AbstractControllerTest;
+import ru.javawebinar.topjava.web.json.JsonUtil;
+
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static ru.javawebinar.topjava.TestUtil.readFromJson;
+import static ru.javawebinar.topjava.TestUtil.userHttpBasic;
+import static ru.javawebinar.topjava.UserTestData.*;
+import static ru.javawebinar.topjava.util.exception.ErrorType.VALIDATION_ERROR;
+import static ru.javawebinar.topjava.web.ExceptionInfoHandler.EXCEPTION_DUPLICATE_EMAIL;
+import static ru.javawebinar.topjava.web.user.ProfileRestController.REST_URL;
+
+class ProfileRestControllerTest extends AbstractControllerTest {
+
+ @Autowired
+ private UserService userService;
+
+ @Test
+ void get() throws Exception {
+ perform(MockMvcRequestBuilders.get(REST_URL)
+ .with(userHttpBasic(USER)))
+ .andExpect(status().isOk())
+ .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
+ .andExpect(USER_MATCHER.contentJson(USER));
+ }
+
+ @Test
+ void getUnAuth() throws Exception {
+ perform(MockMvcRequestBuilders.get(REST_URL))
+ .andExpect(status().isUnauthorized());
+ }
+
+ @Test
+ void delete() throws Exception {
+ perform(MockMvcRequestBuilders.delete(REST_URL)
+ .with(userHttpBasic(USER)))
+ .andExpect(status().isNoContent());
+ USER_MATCHER.assertMatch(userService.getAll(), ADMIN);
+ }
+
+ @Test
+ void register() throws Exception {
+ UserTo newTo = new UserTo(null, "newName", "newemail@ya.ru", "newPassword", 1500);
+ User newUser = UserUtil.createNewFromTo(newTo);
+ ResultActions action = perform(MockMvcRequestBuilders.post(REST_URL + "/register")
+ .contentType(MediaType.APPLICATION_JSON)
+ .content(JsonUtil.writeValue(newTo)))
+ .andDo(print())
+ .andExpect(status().isCreated());
+
+ User created = readFromJson(action, User.class);
+ int newId = created.getId();
+ newUser.setId(newId);
+ USER_MATCHER.assertMatch(created, newUser);
+ USER_MATCHER.assertMatch(userService.get(newId), newUser);
+ }
+
+ @Test
+ void update() throws Exception {
+ UserTo updatedTo = new UserTo(null, "newName", "user@yandex.ru", "newPassword", 1500);
+ perform(MockMvcRequestBuilders.put(REST_URL).contentType(MediaType.APPLICATION_JSON)
+ .with(userHttpBasic(USER))
+ .content(JsonUtil.writeValue(updatedTo)))
+ .andDo(print())
+ .andExpect(status().isNoContent());
+
+ USER_MATCHER.assertMatch(userService.get(USER_ID), UserUtil.updateFromTo(new User(USER), updatedTo));
+ }
+
+ @Test
+ void getWithMeals() throws Exception {
+ assumeDataJpa();
+ perform(MockMvcRequestBuilders.get(REST_URL + "/with-meals")
+ .with(userHttpBasic(USER)))
+ .andExpect(status().isOk())
+ .andDo(print())
+ .andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
+ .andExpect(USER_WITH_MEALS_MATCHER.contentJson(USER));
+ }
+
+ @Test
+ void updateInvalid() throws Exception {
+ UserTo updatedTo = new UserTo(null, null, "password", null, 1500);
+ perform(MockMvcRequestBuilders.put(REST_URL)
+ .contentType(MediaType.APPLICATION_JSON)
+ .with(userHttpBasic(USER))
+ .content(JsonUtil.writeValue(updatedTo)))
+ .andDo(print())
+ .andExpect(status().isUnprocessableEntity())
+ .andExpect(errorType(VALIDATION_ERROR));
+ }
+
+ @Test
+ @Transactional(propagation = Propagation.NEVER)
+ void updateDuplicate() throws Exception {
+ UserTo updatedTo = new UserTo(null, "newName", "admin@gmail.com", "newPassword", 1500);
+ perform(MockMvcRequestBuilders.put(REST_URL).contentType(MediaType.APPLICATION_JSON)
+ .with(userHttpBasic(USER))
+ .content(JsonUtil.writeValue(updatedTo)))
+ .andDo(print())
+ .andExpect(status().isUnprocessableEntity())
+ .andExpect(errorType(VALIDATION_ERROR))
+ .andExpect(detailMessage(EXCEPTION_DUPLICATE_EMAIL));
+ }
+}
\ No newline at end of file
diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml
new file mode 100644
index 000000000000..803655475302
--- /dev/null
+++ b/src/test/resources/logback-test.xml
@@ -0,0 +1,32 @@
+
+
+
+ true
+
+
+
+
+ UTF-8
+ %d{HH:mm:ss.SSS} %highlight(%-5level) %cyan(%class{50}.%M:%L) - %msg%n
+
+
+
+
+
+ UTF-8
+ %magenta(%msg%n)
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/test/resources/spring/inmemory.xml b/src/test/resources/spring/inmemory.xml
new file mode 100644
index 000000000000..1207399dd0ad
--- /dev/null
+++ b/src/test/resources/spring/inmemory.xml
@@ -0,0 +1,11 @@
+
+
+
\ No newline at end of file
diff --git a/src/test/resources/spring/spring-cache.xml b/src/test/resources/spring/spring-cache.xml
new file mode 100644
index 000000000000..92ae4641b704
--- /dev/null
+++ b/src/test/resources/spring/spring-cache.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+ false
+
+
+
+
+
\ No newline at end of file
diff --git a/system.properties b/system.properties
new file mode 100644
index 000000000000..effc2da8e83f
--- /dev/null
+++ b/system.properties
@@ -0,0 +1 @@
+java.runtime.version=14
\ No newline at end of file