Merge pull request #6 from react-dev-uz/master

✨ classes and packages have been updated

Author: DreamCode-Uz

pom.xml

@@ -95,6 +95,14 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/uz/pdp/springsecurityatm/controller/ATMController.java

@@ -0,0 +1,50 @@
+package uz.pdp.springsecurityatm.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import uz.pdp.springsecurityatm.payload.ATMDTO;
+import uz.pdp.springsecurityatm.service.AtmService;
+
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/api/atm")
+public class ATMController {
+    private final AtmService atmService;
+
+    @Autowired
+    public ATMController(AtmService atmService) {
+        this.atmService = atmService;
+    }
+
+    @GetMapping
+    public ResponseEntity<?> getAll() {
+        return atmService.getAllATMs();
+    }
+
+    @GetMapping("/{atmId}")
+    public ResponseEntity<?> getOne(@PathVariable(name = "atmId") Long id) {
+        return atmService.getOneAtm(id);
+    }
+
+    @GetMapping("/summa")
+    public ResponseEntity<?> getSums(@RequestParam(name = "type", defaultValue = "uzs") String type) {
+        return atmService.getSumma(type);
+    }
+
+    @PostMapping
+    public ResponseEntity<?> saveAtm(@RequestBody @Valid ATMDTO atmDTO) {
+        return atmService.saveATM(atmDTO);
+    }
+
+    @PutMapping("/{atmId}")
+    public ResponseEntity<?> editAtm(@PathVariable(name = "atmId") Long id, @RequestBody @Valid ATMDTO atmDTO) {
+        return atmService.editAtm(id, atmDTO);
+    }
+
+    @DeleteMapping("/{atmId}")
+    public ResponseEntity<?> deleteItem(@PathVariable(name = "atmId") Long id) {
+        return atmService.deleteAtm(id);
+    }
+}

src/main/java/uz/pdp/springsecurityatm/controller/BankController.java

@@ -2,13 +2,12 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import uz.pdp.springsecurityatm.entity.Bank;
 import uz.pdp.springsecurityatm.service.BankService;
 
+import javax.validation.Valid;
+
 @RestController
 @RequestMapping("/api/bank")
 public class BankController {
@@ -25,8 +24,23 @@ public ResponseEntity<?> getAll() {
         return service.getAllBank();
     }
 
+    @GetMapping("/{bankId}")
+    public ResponseEntity<?> getOne(@PathVariable(name = "bankId") Integer bankId) {
+        return service.getOneBank(bankId);
+    }
+
     @PostMapping
-    public ResponseEntity<?> save(Bank bank) {
+    public ResponseEntity<?> save(@RequestBody @Valid Bank bank) {
         return service.addBank(bank);
     }
+
+    @PutMapping("/{bankId}")
+    public ResponseEntity<?> update(@PathVariable(name = "bankId") Integer bankId, @RequestBody @Valid Bank bank) {
+        return service.editBank(bankId, bank);
+    }
+
+    @DeleteMapping("/{bankId}")
+    public ResponseEntity<?> delete(@PathVariable(name = "bankId") Integer bankId) {
+        return service.deleteBank(bankId);
+    }
 }

src/main/java/uz/pdp/springsecurityatm/controller/RoleController.java

@@ -2,6 +2,7 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -22,6 +23,7 @@ public RoleController(RoleService service) {
     }
 
     @GetMapping
+    @PreAuthorize("isAuthenticated()")
     public ResponseEntity<?> getAllRoles() {
         return service.getRoles();
     }

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

@@ -29,11 +29,17 @@ public class ATM {
     @OneToOne
     private Address address;
 
+    @ManyToMany
+    private Set<Summa> summas;
+
+    @ManyToMany
+    private Set<Dollar> dollars;
+
     @ManyToOne
-    private User user;
+    private User user;  //  Masul hodim
 
-    private Double balance;
-    private Double commission;
+    private Double balance = 0D;
+    private Double commission = 0D;
     private Double maxWithdraw;
 
     @Override

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

@@ -1,18 +1,20 @@
 package uz.pdp.springsecurityatm.entity;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
+import org.hibernate.Hibernate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import java.util.Objects;
 import java.util.UUID;
 
 @AllArgsConstructor
 @NoArgsConstructor
-@Data
+@Getter
+@Setter
+@ToString
 @Entity
 public class Address {
     @Id
@@ -24,4 +26,17 @@ public class Address {
     private String street;
     @Column(nullable = false)
     private String district;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        Address address = (Address) o;
+        return id != null && Objects.equals(id, address.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
 }

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

@@ -0,0 +1,44 @@
+package uz.pdp.springsecurityatm.entity;
+
+import lombok.*;
+import org.hibernate.Hibernate;
+import uz.pdp.springsecurityatm.entity.enums.USD;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.util.Objects;
+
+/*******************************
+ *   @author Dilshod Fayzullayev
+ ********************************/
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
+@Entity
+public class Dollar {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    private USD usd;
+
+    private Integer count;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        Dollar dollar = (Dollar) o;
+        return id != null && Objects.equals(id, dollar.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
+}

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

@@ -1,5 +1,6 @@
 package uz.pdp.springsecurityatm.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.*;
 import org.hibernate.Hibernate;
 import org.springframework.security.core.GrantedAuthority;
@@ -14,6 +15,7 @@
 @Setter
 @ToString
 @Entity
+@JsonIgnoreProperties(value = {"authority"})
 public class Role implements GrantedAuthority {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

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

@@ -0,0 +1,38 @@
+package uz.pdp.springsecurityatm.entity;
+
+import lombok.*;
+import org.hibernate.Hibernate;
+import uz.pdp.springsecurityatm.entity.enums.UZS;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import java.util.Objects;
+
+@NoArgsConstructor
+@Getter
+@Setter
+@ToString
+@Entity(name = "summa")
+public class Summa {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Enumerated(EnumType.STRING)
+    private UZS uzs;
+
+    private Integer count;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        Summa summa = (Summa) o;
+        return id != null && Objects.equals(id, summa.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
+}

src/main/java/uz/pdp/springsecurityatm/payload/AtmDTO.java

@@ -0,0 +1,32 @@
+package uz.pdp.springsecurityatm.payload;
+
+import lombok.Data;
+import uz.pdp.springsecurityatm.entity.Dollar;
+import uz.pdp.springsecurityatm.entity.Summa;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Set;
+import java.util.UUID;
+
+@Data
+public class AtmDTO {
+    @NotBlank
+    private String street;
+    @NotBlank
+    private String city;
+    @NotBlank
+    private String district;
+    @NotNull
+    private Integer bankId;
+    @NotNull
+    @Min(0)
+    private Double commission;
+    @NotNull
+    private UUID userId; // Ushbu bankomatga javobgar shaxsning id raqami
+    private Double takeOut; // pul yechib olishning maximal miqdori kiritiladi
+    private Set<Summa> sums;
+    private Set<Dollar> dollars;
+    private Set<Integer> cardTypes; //  pul yechib olish uchun ruxsat etilgan karta tiplari kiritiladi
+}