Changeset 748b7f6 for src

Timestamp:

03/03/24 20:56:13 (15 months ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

a3d63eb

Parents:

3ba01da

Message:

RetaurantServiceImpl problemi
isAvailable od tableEntity...

Location:

src/main/java/com/example/rezevirajmasa/demo

Files:

• dto/CustomerDTO.java (modified) (2 diffs)
• model/Customer.java (modified) (1 diff)
• service/CustomerService.java (modified) (2 diffs)
• service/impl/CustomerServiceImpl.java (modified) (2 diffs)
• web/rest/testController.java (modified) (3 diffs)

src/main/java/com/example/rezevirajmasa/demo/dto/CustomerDTO.java

@@ -3 +3 @@
 import com.example.rezevirajmasa.demo.model.MembershipLevel;
 import com.example.rezevirajmasa.demo.model.Role;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.sql.Date;
+import java.sql.Timestamp;
 
+@Setter
+@Getter
 public class CustomerDTO {
     private Long customerId;
@@ -14 +19 @@
     private String address;
     private MembershipLevel membershipLevel;
-    private Date registrationDate;
+//    private Date registrationDate;
     private Role role;
-
-    public Long getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Long customerId) {
-        this.customerId = customerId;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public MembershipLevel getMembershipLevel() {
-        return membershipLevel;
-    }
-
-    public void setMembershipLevel(MembershipLevel membershipLevel) {
-        this.membershipLevel = membershipLevel;
-    }
-
-    public Date getRegistrationDate() {
-        return registrationDate;
-    }
-
-    public void setRegistrationDate(Date registrationDate) {
-        this.registrationDate = registrationDate;
-    }
-
-    public Role getRole() {
-        return role;
-    }
-
-    public void setRole(Role role) {
-        this.role = role;
-    }
 }

src/main/java/com/example/rezevirajmasa/demo/model/Customer.java

@@ -153 +153 @@
                 '}';
     }
+
 }

src/main/java/com/example/rezevirajmasa/demo/service/CustomerService.java

@@ -2 +2 @@
 
 import ch.qos.logback.core.net.server.Client;
+import com.example.rezevirajmasa.demo.dto.CustomerDTO;
 import com.example.rezevirajmasa.demo.model.Customer;
 import com.example.rezevirajmasa.demo.model.MembershipLevel;
@@ -19 +20 @@
     Customer registration(Customer customer);
     boolean deleteById(Long customerId);
+    public CustomerDTO mapCustomerToDTO(Customer customer);
 }

src/main/java/com/example/rezevirajmasa/demo/service/impl/CustomerServiceImpl.java

@@ -1 +1 @@
 package com.example.rezevirajmasa.demo.service.impl;
 
+import com.example.rezevirajmasa.demo.dto.CustomerDTO;
 import com.example.rezevirajmasa.demo.model.Customer;
 import com.example.rezevirajmasa.demo.model.MembershipLevel;
@@ -103 +104 @@
         }
     }
+
+    @Override
+    public CustomerDTO mapCustomerToDTO(Customer customer) {
+        CustomerDTO dto = new CustomerDTO();
+        dto.setCustomerId(customer.getCustomerId());
+        dto.setFirstName(customer.getFirstName());
+        dto.setLastName(customer.getLastName());
+        dto.setAddress(customer.getAddress());
+        dto.setEmail(customer.getEmail());
+        dto.setPhone(customer.getPhone());
+        dto.setMembershipLevel(customer.getMembershipLevel());
+
+        return dto;
+    }
 }

src/main/java/com/example/rezevirajmasa/demo/web/rest/testController.java

@@ -16 +16 @@
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -92 +93 @@
 
     @RequestMapping("/api/customers")
-    public ResponseEntity<List<Customer>> getAllCustomers() {
-        return new ResponseEntity<List<Customer>>(customerService.listAll(), HttpStatus.OK);
+    public ResponseEntity<List<CustomerDTO>> getAllCustomers() {
+        List<Customer> customers = customerService.listAll();
+        List<CustomerDTO> dtos = new ArrayList<>();
+        for(Customer customer : customers) {
+            CustomerDTO dto = customerService.mapCustomerToDTO(customer);
+            dtos.add(dto);
+        }
+        return new ResponseEntity<List<CustomerDTO>>(dtos, HttpStatus.OK);
     }
 
@@ -100 +107 @@
         return new ResponseEntity<Customer>(customerService.findById(id), HttpStatus.OK);
     }
-
-//    @RequestMapping("/api/customers/{id}")
-//    public ResponseEntity<CustomerDTO> getCustomerById(@PathVariable Long id) {
-//        Customer customer = customerService.findById(id);
-//        CustomerDTO customerDTO = new CustomerDTO();
-//        customerDTO.setCustomerId(customerDTO.getCustomerId());
-//        customerDTO.setAddress(customerDTO.getAddress());
-//        customerDTO.setEmail(customerDTO.getEmail());
-//        customerDTO.setPhone(customerDTO.getPhone());
-//        customerDTO.setRole(customerDTO.getRole());
-//        customerDTO.setFirstName(customerDTO.getFirstName());
-//        customerDTO.setLastName(customerDTO.getLastName());
-//        customerDTO.setMembershipLevel(customerDTO.getMembershipLevel());
-//        customerDTO.setRegistrationDate(customerDTO.getRegistrationDate());
-//
-//        return ResponseEntity.ok(customerDTO);
-//    }
-
     @PutMapping("/api/customers/edit/{id}")
     public ResponseEntity<Customer> editCustomerById(@PathVariable Long id, @RequestBody Customer customer) {