✨ add new entity class and edited bank service

Author: react-dev-uz

src/main/java/uz/pdp/springsecurityatm/entity/ATM.java

@@ -1,4 +1,51 @@
 package uz.pdp.springsecurityatm.entity;
 
+import lombok.*;
+import org.hibernate.Hibernate;
+
+import javax.persistence.*;
+import java.util.Objects;
+import java.util.Set;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
+@Entity
 public class ATM {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "card_type", nullable = false)
+    @ManyToMany
+    @ToString.Exclude
+    private Set<CardType> cardType;
+
+    @ManyToOne
+    private Bank bank;
+
+    @OneToOne
+    private Address address;
+
+    @ManyToOne
+    private User user;
+
+    private Double balance;
+    private Double commission;
+    private Double maxWithdraw;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        ATM atm = (ATM) o;
+        return id != null && Objects.equals(id, atm.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
 }

src/main/java/uz/pdp/springsecurityatm/entity/ATMHistory.java

@@ -0,0 +1,54 @@
+package uz.pdp.springsecurityatm.entity;
+
+import lombok.*;
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.CreationTimestamp;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+import java.util.Objects;
+
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
+@Entity(name = "atm_history")
+public class ATMHistory {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private Double summa;   // sumda qancha miqdor yechilganligi
+
+    private Double dollar;  // dollarda qancha miqdor yechilganligi
+
+    @ManyToOne(optional = false)
+    private ATM atm;
+
+    @ManyToOne(optional = false)
+    private Card card;
+
+    @Column(name = "created_at")
+    @CreationTimestamp
+    private Timestamp createdAt;
+
+    public ATMHistory(Double summa, Double dollar, ATM atm, Card card) {
+        this.summa = summa;
+        this.dollar = dollar;
+        this.atm = atm;
+        this.card = card;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        ATMHistory that = (ATMHistory) o;
+        return id != null && Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
+}

src/main/java/uz/pdp/springsecurityatm/entity/Bank.java

@@ -4,6 +4,8 @@
 import org.hibernate.Hibernate;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Objects;
 
 @AllArgsConstructor
@@ -17,7 +19,8 @@ public class Bank {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
 
-    @Column(nullable = false)
+    @NotBlank
+    @Column(nullable = false, unique = true)
     private String name;
 
     @Override

src/main/java/uz/pdp/springsecurityatm/entity/enums/UZS.java

@@ -0,0 +1,5 @@
+package uz.pdp.springsecurityatm.entity.enums;
+
+public enum UZS {
+    _1000, _5000, _10000, _50000, _100000
+}

src/main/java/uz/pdp/springsecurityatm/service/BankService.java

@@ -1,15 +1,15 @@
 package uz.pdp.springsecurityatm.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import uz.pdp.springsecurityatm.entity.Bank;
 import uz.pdp.springsecurityatm.repository.BankRepository;
 
 import static org.springframework.http.HttpStatus.CONFLICT;
 import static org.springframework.http.HttpStatus.CREATED;
-import static org.springframework.http.ResponseEntity.ok;
-import static org.springframework.http.ResponseEntity.status;
+import static org.springframework.http.ResponseEntity.*;
 
 @Service
 public class BankService {
@@ -24,8 +24,35 @@ public ResponseEntity<?> getAllBank() {
         return ok(bankRepository.findAll());
     }
 
+    public ResponseEntity<?> getOneBank(Integer id) {
+        return bankRepository.findById(id).map(ResponseEntity::ok).orElseGet(() -> notFound().build());
+    }
+
     public ResponseEntity<?> addBank(Bank bank) {
         if (bankRepository.existsByName(bank.getName())) return status(CONFLICT).body("Name already exist");
         return status(CREATED).body(bankRepository.save(new Bank(null, bank.getName())));
     }
+
+    public ResponseEntity<?> editBank(Integer id, Bank bank) {
+        return bankRepository.findById(id)
+                .map(b -> {
+                    if (bankRepository.existsByName(bank.getName())) return status(CONFLICT).body("Name already exist");
+                    b.setName(bank.getName());
+                    return status(CREATED).body(bankRepository.save(b));
+                })
+                .orElseGet(() -> notFound().build());
+    }
+
+    public ResponseEntity<?> deleteBank(Integer id) {
+        return bankRepository.findById(id)
+                .map(bank -> {
+                    try {
+                        bankRepository.delete(bank);
+                        return status(HttpStatus.NO_CONTENT).body("Bank deleted");
+                    } catch (Exception e) {
+                        return status(HttpStatus.INTERNAL_SERVER_ERROR).body(e.getMessage());
+                    }
+                })
+                .orElseGet(() -> notFound().build());
+    }
 }

src/main/resources/application.properties

@@ -11,7 +11,7 @@ spring.jackson.time-zone=Asia/Tashkent
 #   JWT EXPIRATION TIME
 spring.jwt.expiration=3600
 #   DATA INITIALIZATION
-spring.data.initialization=never
+spring.data.initialization=always
 #   FOR EMAIL INTEGRATION
 spring.mail.host=smtp.gmail.com
 spring.mail.port=587