Merge branch 'main' into Balance-Implementation

ADORSYS-GIS · Jun 13, 2024 · 6e6bdf6 · 6e6bdf6
2 parents 8aade64 + a286eba
commit 6e6bdf6
Show file tree

Hide file tree

Showing 22 changed files with 1,666 additions and 1,232 deletions.
diff --git a/...-pay-backend/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/domain/Procedure.java b/...-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)

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
@@ -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;
     }

diff --git a/...end/src/main/java/com/adorsys/gis/powerpay/powerpaybackend/repository/UserRepository.java b/...end/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<User, String> {
+public interface UserRepository extends JpaRepository<User, Long> {
 
     Optional<User> findByPhoneNumber(String phoneNumber);
 }
diff --git a/power-pay-backend/src/main/resources/application.yaml b/power-pay-backend/src/main/resources/application.yaml
@@ -1,8 +1,14 @@
+spring:
+  application:
+    name: e2e-banking-app
+  profile:
+    active: dev,postgres
+
 management:
   endpoints:
     web:
       exposure:
         include: health, metrics
   endpoint:
     health:
-      show-details: always
+      show-details: always
diff --git a/power-pay-frontend/dev-dist/sw.js b/power-pay-frontend/dev-dist/sw.js
@@ -82,7 +82,7 @@ define(['./workbox-b5f7729d'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.e7p0g793m68"
+    "revision": "0.238rr2rpmug"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

diff --git a/power-pay-frontend/index.html b/power-pay-frontend/index.html
@@ -7,7 +7,7 @@
   <link rel="icon" href="/favicon.svg" type="image/svg+xml">
   <link rel="manifest" href="/manifest.json">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title></title>
   </head>
   <body>
     <div id="root"></div>