Changeset 748b7f6


Ignore:
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...

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • my-react-app/src/components/Customers.js

    r3ba01da r748b7f6  
    4444                            <div className="card h-100">
    4545                                <div className="card-body">
    46                                     <h5 className="card-title">{customer.fullName}</h5>
     46                                    <h5 className="card-title">{customer.firstName + " " + customer.lastName}</h5>
    4747                                    <p className="card-text"><strong>Email:</strong> {customer.email}</p>
    4848                                    <p className="card-text"><strong>Phone:</strong> {customer.phone}</p>
    … …  
    5050                                    <p className="card-text"><strong>Membership
    5151                                        Level:</strong> {customer.membershipLevel}</p>
    52                                     <p className="card-text"><strong>Registration
    53                                         Date:</strong> {new Date(customer.registrationDate).toLocaleString()}</p>
     52                                    {/*<p className="card-text"><strong>Registration*/}
     53                                    {/*    Date:</strong> {new Date(customer.registrationDate).toLocaleString()}</p>*/}
    5454                                </div>
    5555                                <button onClick={() => handleDetailClick(customer.customerId)}>View Details</button>

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

    r3ba01da r748b7f6  
    33import com.example.rezevirajmasa.demo.model.MembershipLevel;
    44import com.example.rezevirajmasa.demo.model.Role;
     5import lombok.Getter;
     6import lombok.Setter;
    57
    68import java.sql.Date;
     9import java.sql.Timestamp;
    710
     11@Setter
     12@Getter
    813public class CustomerDTO {
    914    private Long customerId;
    … …  
    1419    private String address;
    1520    private MembershipLevel membershipLevel;
    16     private Date registrationDate;
     21//    private Date registrationDate;
    1722    private Role role;
    18 
    19     public Long getCustomerId() {
    20         return customerId;
    21     }
    22 
    23     public void setCustomerId(Long customerId) {
    24         this.customerId = customerId;
    25     }
    26 
    27     public String getFirstName() {
    28         return firstName;
    29     }
    30 
    31     public void setFirstName(String firstName) {
    32         this.firstName = firstName;
    33     }
    34 
    35     public String getLastName() {
    36         return lastName;
    37     }
    38 
    39     public void setLastName(String lastName) {
    40         this.lastName = lastName;
    41     }
    42 
    43     public String getEmail() {
    44         return email;
    45     }
    46 
    47     public void setEmail(String email) {
    48         this.email = email;
    49     }
    50 
    51     public String getPhone() {
    52         return phone;
    53     }
    54 
    55     public void setPhone(String phone) {
    56         this.phone = phone;
    57     }
    58 
    59     public String getAddress() {
    60         return address;
    61     }
    62 
    63     public void setAddress(String address) {
    64         this.address = address;
    65     }
    66 
    67     public MembershipLevel getMembershipLevel() {
    68         return membershipLevel;
    69     }
    70 
    71     public void setMembershipLevel(MembershipLevel membershipLevel) {
    72         this.membershipLevel = membershipLevel;
    73     }
    74 
    75     public Date getRegistrationDate() {
    76         return registrationDate;
    77     }
    78 
    79     public void setRegistrationDate(Date registrationDate) {
    80         this.registrationDate = registrationDate;
    81     }
    82 
    83     public Role getRole() {
    84         return role;
    85     }
    86 
    87     public void setRole(Role role) {
    88         this.role = role;
    89     }
    9023}

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

    r3ba01da r748b7f6  
    153153                '}';
    154154    }
     155
    155156}

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

    r3ba01da r748b7f6  
    22
    33import ch.qos.logback.core.net.server.Client;
     4import com.example.rezevirajmasa.demo.dto.CustomerDTO;
    45import com.example.rezevirajmasa.demo.model.Customer;
    56import com.example.rezevirajmasa.demo.model.MembershipLevel;
    … …  
    1920    Customer registration(Customer customer);
    2021    boolean deleteById(Long customerId);
     22    public CustomerDTO mapCustomerToDTO(Customer customer);
    2123}

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

    r3ba01da r748b7f6  
    11package com.example.rezevirajmasa.demo.service.impl;
    22
     3import com.example.rezevirajmasa.demo.dto.CustomerDTO;
    34import com.example.rezevirajmasa.demo.model.Customer;
    45import com.example.rezevirajmasa.demo.model.MembershipLevel;
    … …  
    103104        }
    104105    }
     106
     107    @Override
     108    public CustomerDTO mapCustomerToDTO(Customer customer) {
     109        CustomerDTO dto = new CustomerDTO();
     110        dto.setCustomerId(customer.getCustomerId());
     111        dto.setFirstName(customer.getFirstName());
     112        dto.setLastName(customer.getLastName());
     113        dto.setAddress(customer.getAddress());
     114        dto.setEmail(customer.getEmail());
     115        dto.setPhone(customer.getPhone());
     116        dto.setMembershipLevel(customer.getMembershipLevel());
     117
     118        return dto;
     119    }
    105120}

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

    r3ba01da r748b7f6  
    1616import java.time.LocalDateTime;
    1717import java.time.format.DateTimeFormatter;
     18import java.util.ArrayList;
    1819import java.util.List;
    1920import java.util.Map;
    … …  
    9293
    9394    @RequestMapping("/api/customers")
    94     public ResponseEntity<List<Customer>> getAllCustomers() {
    95         return new ResponseEntity<List<Customer>>(customerService.listAll(), HttpStatus.OK);
     95    public ResponseEntity<List<CustomerDTO>> getAllCustomers() {
     96        List<Customer> customers = customerService.listAll();
     97        List<CustomerDTO> dtos = new ArrayList<>();
     98        for(Customer customer : customers) {
     99            CustomerDTO dto = customerService.mapCustomerToDTO(customer);
     100            dtos.add(dto);
     101        }
     102        return new ResponseEntity<List<CustomerDTO>>(dtos, HttpStatus.OK);
    96103    }
    97104
    … …  
    100107        return new ResponseEntity<Customer>(customerService.findById(id), HttpStatus.OK);
    101108    }
    102 
    103 //    @RequestMapping("/api/customers/{id}")
    104 //    public ResponseEntity<CustomerDTO> getCustomerById(@PathVariable Long id) {
    105 //        Customer customer = customerService.findById(id);
    106 //        CustomerDTO customerDTO = new CustomerDTO();
    107 //        customerDTO.setCustomerId(customerDTO.getCustomerId());
    108 //        customerDTO.setAddress(customerDTO.getAddress());
    109 //        customerDTO.setEmail(customerDTO.getEmail());
    110 //        customerDTO.setPhone(customerDTO.getPhone());
    111 //        customerDTO.setRole(customerDTO.getRole());
    112 //        customerDTO.setFirstName(customerDTO.getFirstName());
    113 //        customerDTO.setLastName(customerDTO.getLastName());
    114 //        customerDTO.setMembershipLevel(customerDTO.getMembershipLevel());
    115 //        customerDTO.setRegistrationDate(customerDTO.getRegistrationDate());
    116 //
    117 //        return ResponseEntity.ok(customerDTO);
    118 //    }
    119 
    120109    @PutMapping("/api/customers/edit/{id}")
    121110    public ResponseEntity<Customer> editCustomerById(@PathVariable Long id, @RequestBody Customer customer) {
Note: See TracChangeset for help on using the changeset viewer.