Merge pull request #6 from funnyDevGirl/fix-models

Fix models

Author: Malcom1986

src/main/java/org/example/hexlet/model/Car.java

@@ -4,13 +4,16 @@
 import lombok.Setter;
 import lombok.ToString;
 
+import java.time.LocalDateTime;
+
 @Getter
 @Setter
 @ToString
 public final class Car {
     private Long id;
     private String make;
     private String model;
+    private LocalDateTime createdAt;
 
     public Car(String make, String model) {
         this.make = make;

src/main/java/org/example/hexlet/model/Course.java

@@ -4,6 +4,8 @@
 import lombok.Setter;
 import lombok.ToString;
 
+import java.time.LocalDateTime;
+
 @Getter
 @Setter
 @ToString
@@ -13,6 +15,7 @@ public final class Course {
     @ToString.Include
     private String name;
     private String description;
+    private LocalDateTime createdAt;
 
     public Course(String name, String description) {
         this.name = name;

src/main/java/org/example/hexlet/model/Post.java

@@ -4,6 +4,8 @@
 import lombok.Setter;
 import lombok.ToString;
 
+import java.time.LocalDateTime;
+
 @Getter
 @Setter
 @ToString
@@ -15,6 +17,7 @@ public final class Post {
     private String title;
 
     private String body;
+    private LocalDateTime createdAt;
 
     public Post(String title, String body) {
         this.title = title;

src/main/java/org/example/hexlet/model/User.java

@@ -4,6 +4,8 @@
 import lombok.Setter;
 import lombok.ToString;
 
+import java.time.LocalDateTime;
+
 @Getter
 @Setter
 @ToString
@@ -15,6 +17,7 @@ public final class User {
 
     private String email;
     private String password;
+    private LocalDateTime createdAt;
 
     public User(String name, String email, String password) {
         this.name = name;

src/main/java/org/example/hexlet/repository/CarRepository.java

@@ -2,6 +2,8 @@
 
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -10,15 +12,20 @@
 
 public class CarRepository extends BaseRepository {
     public static void save(Car car) throws SQLException {
-        var sql = "INSERT INTO cars (make, model) VALUES (?, ?)";
+        var sql = "INSERT INTO cars (make, model, created_at) VALUES (?, ?, ?)";
         try (var conn = dataSource.getConnection();
                 var preparedStatement = conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
             preparedStatement.setString(1, car.getMake());
             preparedStatement.setString(2, car.getModel());
+            var createdAt = LocalDateTime.now();
+            preparedStatement.setTimestamp(3, Timestamp.valueOf(createdAt));
+
             preparedStatement.executeUpdate();
             var generatedKeys = preparedStatement.getGeneratedKeys();
             if (generatedKeys.next()) {
                 car.setId(generatedKeys.getLong(1));
+                car.setCreatedAt(createdAt);
+
             } else {
                 throw new SQLException("DB have not returned an id after saving an entity");
             }
@@ -34,8 +41,11 @@ public static Optional<Car> find(Long id) throws SQLException {
             if (resultSet.next()) {
                 var make = resultSet.getString("make");
                 var model = resultSet.getString("model");
+                var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime();
+
                 var car = new Car(make, model);
                 car.setId(id);
+                car.setCreatedAt(createdAt);
                 return Optional.of(car);
             }
             return Optional.empty();
@@ -52,8 +62,11 @@ public static List<Car> getEntities() throws SQLException {
                 var id = resultSet.getLong("id");
                 var make = resultSet.getString("make");
                 var model = resultSet.getString("model");
+                var createdAt = resultSet.getTimestamp("created_at").toLocalDateTime();
+
                 var car = new Car(make, model);
                 car.setId(id);
+                car.setCreatedAt(createdAt);
                 result.add(car);
             }
             return result;

src/main/java/org/example/hexlet/repository/CourseRepository.java

@@ -1,5 +1,6 @@
 package org.example.hexlet.repository;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -11,6 +12,7 @@ public class CourseRepository {
 
     public static void save(Course course) {
         course.setId((long) entities.size() + 1);
+        course.setCreatedAt(LocalDateTime.now());
         entities.add(course);
     }
 

src/main/java/org/example/hexlet/repository/PostRepository.java

@@ -1,5 +1,6 @@
 package org.example.hexlet.repository;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -11,6 +12,7 @@ public class PostRepository {
 
     public static void save(Post post) {
         post.setId((long) entities.size() + 1);
+        post.setCreatedAt(LocalDateTime.now());
         entities.add(post);
     }
 

src/main/java/org/example/hexlet/repository/UserRepository.java

@@ -1,5 +1,6 @@
 package org.example.hexlet.repository;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -11,6 +12,7 @@ public class UserRepository {
 
     public static void save(User user) {
         user.setId((long) entities.size() + 1);
+        user.setCreatedAt(LocalDateTime.now());
         entities.add(user);
     }
 

src/main/resources/schema.sql

@@ -3,13 +3,15 @@ DROP TABLE IF EXISTS courses;
 CREATE TABLE courses (
     id INT PRIMARY KEY AUTO_INCREMENT,
     name VARCHAR(255) NOT NULL,
-    description TEXT
+    description TEXT,
+    created_at TIMESTAMP
 );
 
 DROP TABLE IF EXISTS cars;
 
 CREATE TABLE cars (
     id INT PRIMARY KEY AUTO_INCREMENT,
     make VARCHAR(255) NOT NULL,
-    model VARCHAR(255) NOT NULL
+    model VARCHAR(255) NOT NULL,
+    created_at TIMESTAMP
 );