Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
fbec6db
Add description
JavaWebinar Nov 5, 2016
81a0a1a
Add HW0 comments
JavaWebinar Nov 10, 2016
4f29fe7
Update README.md
JavaOPs Nov 30, 2016
fab7022
Update README.md
JavaOPs Dec 1, 2016
ce1caba
Update README.md
JavaOPs Dec 1, 2016
c01186b
Prepare to HW0
meirakhmetov Dec 4, 2016
25dc217
1_1_HW0
meirakhmetov Dec 21, 2016
f7860da
1_2_HW0_cycle
meirakhmetov Dec 21, 2016
f48e28a
1_3_switch_to_war
meirakhmetov Dec 21, 2016
1d4c218
1_4_add_servlet_api
meirakhmetov Dec 21, 2016
502dd4a
1_4_add_servlet_api2
meirakhmetov Dec 21, 2016
0f5921b
1_5_forward_to_redirect
meirakhmetov Dec 22, 2016
f0250cb
1_6_logging
meirakhmetov Dec 22, 2016
6b461d9
1_6_remote_jmx
meirakhmetov Dec 22, 2016
24b92d1
HW1
meirakhmetov Dec 23, 2016
274b8ef
HW1_CRUD
meirakhmetov Jan 16, 2017
d18ae8d
2_3_app_layers
meirakhmetov Jan 16, 2017
b7c1ab2
2_4_add_spring_context
meirakhmetov Jan 17, 2017
fc99f7b
2_5_add_dependency_injection
meirakhmetov Jan 17, 2017
9f611f4
2_5_add_dependency_injection
meirakhmetov Jan 17, 2017
14ffad3
2_6_add_annotation_processing
meirakhmetov Jan 17, 2017
2aa144c
3_0_fix_validate
meirakhmetov Jan 17, 2017
951c7d1
3_01_HW2_repository
meirakhmetov Jan 17, 2017
564049b
3_01_HW2_repository
meirakhmetov Jan 17, 2017
379c502
3_02_HW2_meal_layers
meirakhmetov Jan 17, 2017
07a9a74
3_03_HW2_optional_MealServlet
meirakhmetov Jan 17, 2017
6ed96bf
3_4_HW2_optional_filter
meirakhmetov Jan 17, 2017
bb68b77
3_5_HW2_optional_select_user
meirakhmetov Jan 17, 2017
1106ce7
3_06_bean_life_cycle
meirakhmetov Jan 17, 2017
0eed750
3_07_add_junit
meirakhmetov Jan 17, 2017
e1f7370
3_08_add_spring_test
meirakhmetov Jan 17, 2017
f2e869e
3_09_add_postgresql
meirakhmetov Jan 17, 2017
cd1216f
3_10_populate_and_init_db
meirakhmetov Jan 18, 2017
f7a4702
3_11_impl_JdbcUserRepository
meirakhmetov Jan 18, 2017
970bbd3
3_12_test_UserService
meirakhmetov Jan 18, 2017
3330e80
3_13_test_logging
meirakhmetov Jan 18, 2017
710f0b2
3_14_fix_servlet
meirakhmetov Jan 18, 2017
0b9d329
4_0_fix
meirakhmetov Jan 19, 2017
f0c9bcb
4_1_HW3
meirakhmetov Jan 19, 2017
071a6d5
4_2_HW3_optional
meirakhmetov Jan 19, 2017
da0852d
4_3_improve_code
meirakhmetov Jan 19, 2017
74a7205
4_4_init_and_populate_db
meirakhmetov Jan 19, 2017
577298e
4_5_create_mock_test_ctx
meirakhmetov Jan 19, 2017
21a38c3
Update README.md
meirakhmetov Nov 25, 2024
59b9c05
Update Main.java
meirakhmetov Nov 25, 2024
ade580e
added var test to Main.java
meirakhmetov Nov 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
4_1_HW3
  • Loading branch information
meirakhmetov committed Jan 19, 2017
commit f0c9bcb03f72188ed1f8ce1a18987e93662c61cd
21 changes: 18 additions & 3 deletions src/main/java/ru/javawebinar/topjava/model/Meal.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@
* 11.01.2015.
*/
public class Meal extends BaseEntity {
private final LocalDateTime dateTime;
private LocalDateTime dateTime;

private final String description;
private String description;

private final int calories;
private int calories;

public Meal() {
}

public Meal(LocalDateTime dateTime, String description, int calories) {
this(null, dateTime, description, calories);
Expand Down Expand Up @@ -46,6 +49,18 @@ public LocalTime getTime() {
return dateTime.toLocalTime();
}

public void setDateTime(LocalDateTime dateTime) {
this.dateTime = dateTime;
}

public void setDescription(String description) {
this.description = description;
}

public void setCalories(int calories) {
this.calories = calories;
}

@Override
public String toString() {
return "Meal{" +
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
package ru.javawebinar.topjava.repository.jdbc;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.support.DataAccessUtils;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
import org.springframework.stereotype.Repository;
import ru.javawebinar.topjava.model.Meal;
import ru.javawebinar.topjava.repository.MealRepository;

import javax.sql.DataSource;
import java.time.LocalDateTime;
import java.util.List;

Expand All @@ -15,28 +24,69 @@
@Repository
public class JdbcMealRepositoryImpl implements MealRepository {

private static final RowMapper<Meal> ROW_MAPPER = BeanPropertyRowMapper.newInstance(Meal.class);

@Autowired
private JdbcTemplate jdbcTemplate;

@Autowired
private NamedParameterJdbcTemplate namedParameterJdbcTemplate;

private SimpleJdbcInsert insertMeal;

@Autowired
public JdbcMealRepositoryImpl(DataSource dataSource) {
this.insertMeal = new SimpleJdbcInsert(dataSource)
.withTableName("meals")
.usingGeneratedKeyColumns("id");
}

@Override
public Meal save(Meal meal, int userId) {
return null;
public Meal save(Meal userMeal, int userId) {
MapSqlParameterSource map = new MapSqlParameterSource()
.addValue("id", userMeal.getId())
.addValue("description", userMeal.getDescription())
.addValue("calories", userMeal.getCalories())
.addValue("date_time", userMeal.getDateTime())
.addValue("user_id", userId);

if (userMeal.isNew()) {
Number newId = insertMeal.executeAndReturnKey(map);
userMeal.setId(newId.intValue());
} else {
if (namedParameterJdbcTemplate.update("" +
"UPDATE meals " +
" SET description=:description, calories=:calories, date_time=:date_time " +
" WHERE id=:id AND user_id=:user_id"
, map) == 0) {
return null;
}
}
return userMeal;
}

@Override
public boolean delete(int id, int userId) {
return false;
return jdbcTemplate.update("DELETE FROM meals WHERE id=? AND user_id=?", id, userId) != 0;
}

@Override
public Meal get(int id, int userId) {
return null;
List<Meal> meals = jdbcTemplate.query(
"SELECT * FROM meals WHERE id = ? AND user_id = ?", ROW_MAPPER, id, userId);
return DataAccessUtils.singleResult(meals);
}

@Override
public List<Meal> getAll(int userId) {
return null;
return jdbcTemplate.query(
"SELECT * FROM meals WHERE user_id=? ORDER BY date_time DESC", ROW_MAPPER, userId);
}

@Override
public List<Meal> getBetween(LocalDateTime startDate, LocalDateTime endDate, int userId) {
return null;
return jdbcTemplate.query(
"SELECT * FROM meals WHERE user_id=? AND date_time BETWEEN ? AND ? ORDER BY date_time DESC",
ROW_MAPPER, userId, startDate, endDate);
}
}
11 changes: 11 additions & 0 deletions src/main/resources/db/initDB.sql
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
DROP TABLE IF EXISTS user_roles;
DROP TABLE IF EXISTS meals;
DROP TABLE IF EXISTS users;
DROP SEQUENCE IF EXISTS global_seq;

Expand All @@ -23,3 +24,13 @@ CREATE TABLE user_roles
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)
11 changes: 11 additions & 0 deletions src/main/resources/db/populateDB.sql
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
DELETE FROM user_roles;
DELETE FROM meals;
DELETE FROM users;
ALTER SEQUENCE global_seq RESTART WITH 100000;

Expand All @@ -11,3 +12,13 @@ VALUES ('Admin', 'admin@gmail.com', 'admin');
INSERT INTO user_roles (role, user_id) VALUES
('ROLE_USER', 100000),
('ROLE_ADMIN', 100001);

INSERT INTO meals (date_time, description, calories, user_id) VALUES
('2015-05-30 10:00:00', 'Завтрак', 500, 100000),
('2015-05-30 13:00:00', 'Обед', 1000, 100000),
('2015-05-30 20:00:00', 'Ужин', 500, 100000),
('2015-05-31 10:00:00', 'Завтрак', 500, 100000),
('2015-05-31 13:00:00', 'Обед', 1000, 100000),
('2015-05-31 20:00:00', 'Ужин', 510, 100000),
('2015-06-01 14:00:00', 'Админ ланч', 510, 100001),
('2015-06-01 21:00:00', 'Админ ужин', 1500, 100001);