-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'create-global-exception-handler' of github.com:jv-jun23…
…-team5/car-sharing-app into create-global-exception-handler
- Loading branch information
Showing
7 changed files
with
176 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
src/main/java/com/project/carsharingapp/model/Payment.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
package com.project.carsharingapp.model; | ||
|
||
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; | ||
|
||
@Entity | ||
@Setter | ||
@Getter | ||
@Table(name = "payments") | ||
public class Payment { | ||
@Id | ||
@GeneratedValue(strategy = GenerationType.IDENTITY) | ||
private Long id; | ||
@Enumerated(value = EnumType.STRING) | ||
@Column(nullable = false) | ||
private Status status; | ||
@Enumerated(value = EnumType.STRING) | ||
@Column(nullable = false) | ||
private Type type; | ||
@OneToOne(fetch = FetchType.LAZY) | ||
@JoinColumn(name = "rental_id", nullable = false) | ||
private Rental rentalId; | ||
@Column(name = "session_url", nullable = false) | ||
private String sessionUrl; | ||
@Column(name = "session_id", nullable = false) | ||
private String sessionId; | ||
@Column(nullable = false) | ||
private BigDecimal amount; | ||
|
||
public enum Status { | ||
PENDING, | ||
PAID | ||
} | ||
|
||
public enum Type { | ||
PAYMENT, | ||
FINE | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
src/main/java/com/project/carsharingapp/repository/PaymentRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
package com.project.carsharingapp.repository; | ||
|
||
import com.project.carsharingapp.model.Payment; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
|
||
public interface PaymentRepository extends JpaRepository<Payment, Long> { | ||
|
||
} |
47 changes: 47 additions & 0 deletions
47
src/main/resources/db/changelog/changes/create-payments-table.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
48 changes: 48 additions & 0 deletions
48
src/main/resources/db/changelog/changes/create-rentals-table.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
databaseChangeLog: | ||
- changeSet: | ||
id: create-rentals-table | ||
author: ivan-diatliuk | ||
changes: | ||
- createTable: | ||
tableName: rentals | ||
columns: | ||
- column: | ||
name: id | ||
type: bigint | ||
autoIncrement: true | ||
constraints: | ||
nullable: false | ||
primaryKey: true | ||
- column: | ||
name: rental_date | ||
type: timestamp | ||
constraints: | ||
nullable: false | ||
- column: | ||
name: return_date | ||
type: timestamp | ||
constraints: | ||
nullable: false | ||
- column: | ||
name: actual_return_date | ||
type: timestamp | ||
- column: | ||
name: car_id | ||
type: bigint | ||
constraints: | ||
nullable: false | ||
foreignKeyName: fk_car_id | ||
references: cars(id) | ||
- column: | ||
name: user_id | ||
type: bigint | ||
constraints: | ||
nullable: false | ||
foreignKeyName: fk_user_id | ||
references: users(id) | ||
- column: | ||
name: is_deleted | ||
type: boolean | ||
defaultValueBoolean: false | ||
constraints: | ||
nullable: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters