From 1d1f2f9ae70e2d142457eaaff07ed01b220ed68d Mon Sep 17 00:00:00 2001 From: nkwajudetambe Date: Wed, 12 Jun 2024 14:51:15 +0100 Subject: [PATCH 1/5] feat:backend:Implement Joined Table Inheritance strategy for Procedure entity --- .../gis/powerpay/powerpaybackend/domain/Procedure.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/domain/Procedure.java b/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/domain/Procedure.java index 64d05c1b..5f6553fb 100644 --- a/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/domain/Procedure.java +++ b/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/domain/Procedure.java @@ -1,10 +1,8 @@ package com.adorsys.gis.powerpay.powerpaybackend.domain; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import jakarta.persistence.*; @Entity +@Inheritance(strategy = InheritanceType.JOINED) public abstract class Procedure { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) From cac5f27b097a404c02e23b4f5d5bbaa4ffedbaf9 Mon Sep 17 00:00:00 2001 From: nkwajudetambe Date: Wed, 12 Jun 2024 14:56:10 +0100 Subject: [PATCH 2/5] feat:backend:Add table name and ID field to User entity --- .../gis/powerpay/powerpaybackend/domain/User.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/domain/User.java b/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/domain/User.java index 6125a72d..47a10ecc 100644 --- a/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/domain/User.java +++ b/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/domain/User.java @@ -1,18 +1,25 @@ package com.adorsys.gis.powerpay.powerpaybackend.domain; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; +import jakarta.persistence.*; @Entity +@Table(name = "users") public class User { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; private String phoneNumber; private String pin; private String userName; + public Long getId(){ + return id; + } + + public void setId(Long id){ + this.id = id; + } + public String getPhoneNumber() { return phoneNumber; } From ef3c91378f7f10e948d57c0680ed39c82d8b7a83 Mon Sep 17 00:00:00 2001 From: nkwajudetambe Date: Wed, 12 Jun 2024 15:03:37 +0100 Subject: [PATCH 3/5] fix:Correct UserRepository to use Long for User ID --- .../gis/powerpay/powerpaybackend/repository/UserRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/repository/UserRepository.java b/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/repository/UserRepository.java index 0ae9b4a6..ea86512c 100644 --- a/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/repository/UserRepository.java +++ b/power-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/repository/UserRepository.java @@ -7,7 +7,7 @@ import java.util.Optional; @Repository -public interface UserRepository extends JpaRepository { +public interface UserRepository extends JpaRepository { Optional findByPhoneNumber(String phoneNumber); } From 8549ede7b35bfa791544dcc66415f7106050e8e2 Mon Sep 17 00:00:00 2001 From: nkwajudetambe Date: Wed, 12 Jun 2024 16:41:17 +0100 Subject: [PATCH 4/5] feat:Add database and management configurations to application.yaml --- .../src/main/resources/application.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/power-pay-backend/src/main/resources/application.yaml b/power-pay-backend/src/main/resources/application.yaml index 0717fde0..224172d1 100644 --- a/power-pay-backend/src/main/resources/application.yaml +++ b/power-pay-backend/src/main/resources/application.yaml @@ -1,3 +1,17 @@ +spring: + application: + name: e2e-banking-app + + datasource: + url: jdbc:postgresql://localhost:5432/bank1 + username: e2e + password: e2e1234. + driver-class-name: org.postgresql.Driver + + jpa: + hibernate: + ddl-auto: update + management: endpoints: web: @@ -5,4 +19,4 @@ management: include: health, metrics endpoint: health: - show-details: always \ No newline at end of file + show-details: always From 856d0e9cbb1cf495144b0746c95556223fa1dc98 Mon Sep 17 00:00:00 2001 From: nkwajudetambe Date: Thu, 13 Jun 2024 08:59:17 +0100 Subject: [PATCH 5/5] chore:Separate PostgreSQL and development configurations into profile-specific YAML files --- .../src/main/resources/application.yaml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/power-pay-backend/src/main/resources/application.yaml b/power-pay-backend/src/main/resources/application.yaml index 224172d1..6b280a9a 100644 --- a/power-pay-backend/src/main/resources/application.yaml +++ b/power-pay-backend/src/main/resources/application.yaml @@ -1,16 +1,8 @@ spring: application: name: e2e-banking-app - - datasource: - url: jdbc:postgresql://localhost:5432/bank1 - username: e2e - password: e2e1234. - driver-class-name: org.postgresql.Driver - - jpa: - hibernate: - ddl-auto: update + profile: + active: dev,postgres management: endpoints: