From 0a2bb3346902599133d1acba1a7eb39fe40738a8 Mon Sep 17 00:00:00 2001
From: Ivan Diatliuk <dyatlyukk.ivan@gmail.com>
Date: Mon, 2 Oct 2023 21:21:43 +0300
Subject: [PATCH] added a liquibase file for creating payments table and fixed
 some checkstyle issues

---
 .../project/carsharingapp/model/Payment.java  | 13 ++++-
 .../project/carsharingapp/model/Rental.java   | 12 ++++-
 src/main/resources/application.properties     |  8 ++--
 .../changes/create-payments-table.yaml        | 47 +++++++++++++++++++
 .../db/changelog/db.changelog-master.yaml     |  3 +-
 5 files changed, 74 insertions(+), 9 deletions(-)
 create mode 100644 src/main/resources/db/changelog/changes/create-payments-table.yaml

diff --git a/src/main/java/com/project/carsharingapp/model/Payment.java b/src/main/java/com/project/carsharingapp/model/Payment.java
index 5d3ea9c..35c03c0 100644
--- a/src/main/java/com/project/carsharingapp/model/Payment.java
+++ b/src/main/java/com/project/carsharingapp/model/Payment.java
@@ -1,7 +1,16 @@
 package com.project.carsharingapp.model;
 
-import jakarta.persistence.*;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import java.math.BigDecimal;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/java/com/project/carsharingapp/model/Rental.java b/src/main/java/com/project/carsharingapp/model/Rental.java
index 938fada..76117d3 100644
--- a/src/main/java/com/project/carsharingapp/model/Rental.java
+++ b/src/main/java/com/project/carsharingapp/model/Rental.java
@@ -1,7 +1,15 @@
 package com.project.carsharingapp.model;
 
-import jakarta.persistence.*;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 2532435..6059ae8 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,7 +1,7 @@
-#spring.datasource.url=jdbc:mysql://localhost:3306/car_sharing_db?serverTimezone=UTC
-#spring.datasource.username=root
-#spring.datasource.password=anton7570857
-#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://localhost:3306/car_sharing_db?serverTimezone=UTC
+spring.datasource.username=root
+spring.datasource.password=redblack0root
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 
 server.servlet.context-path=/api
 spring.jpa.hibernate.ddl-auto=validate
diff --git a/src/main/resources/db/changelog/changes/create-payments-table.yaml b/src/main/resources/db/changelog/changes/create-payments-table.yaml
new file mode 100644
index 0000000..ecce451
--- /dev/null
+++ b/src/main/resources/db/changelog/changes/create-payments-table.yaml
@@ -0,0 +1,47 @@
+databaseChangeLog:
+  - changeSet:
+      id: create-payments-table
+      author: ivan-diatliuk
+      changes:
+        - createTable:
+            tableName: payments
+            columns:
+              - column:
+                  name: id
+                  type: bigint
+                  autoIncrement: true
+                  constraints:
+                    nullable: false
+                    primaryKey: true
+              - column:
+                  name: status
+                  type: varchar(255)
+                  constraints:
+                    nullable: false
+              - column:
+                  name: type
+                  type: varchar(255)
+                  constraints:
+                    nullable: false
+              - column:
+                  name: rental_id
+                  type: bigint
+                  constraints:
+                    nullable: false
+                    foreignKeyName: fk_rental_id
+                    references: rentals(id)
+              - column:
+                  name: session_url
+                  type: varchar(255)
+                  constraints:
+                    nullable: false
+              - column:
+                  name: session_id
+                  type: varchar(255)
+                  constraints:
+                    nullable: false
+              - column:
+                  name: amount
+                  type: decimal
+                  constraints:
+                    nullable: false
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
index 6ec31e6..49fe811 100644
--- a/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -9,4 +9,5 @@ databaseChangeLog:
       file: db/changelog/changes/create-user-roles-table.yaml
   - include:
       file: db/changelog/changes/create-rentals-table.yaml
-
+  - include:
+      file: db/changelog/changes/create-payments-table.yaml