Product update product entity

docker-compose.yaml

@@ -1,24 +1,6 @@
 version: '3.9'
 services:
 
-  #
-  # Mongo Database
-  #
-  mongodb:
-    image: "mongo:latest"
-    container_name: mongodb
-    environment:
-      - MONGO_INITDB_ROOT_USERNAME=rootuser
-      - MONGO_INITDB_ROOT_PASSWORD=rootpass
-    ports:
-      - '27017:27017'
-    networks:
-      - online-store-network
-    profiles:
-      - dev
-      - test
-      - prod
-
   #
   # Postgresql Database
   #
@@ -60,8 +42,6 @@ services:
       timeout: 5s
       retries: 5
       start_period: 40s
-    depends_on:
-      - mongodb
     deploy:
       replicas: 1
     networks:

pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
@@ -231,6 +231,18 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+
+        <!--        DataBase dependencies-->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.5.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.liquibase</groupId>
+            <artifactId>liquibase-core</artifactId>
+            <version>4.23.0</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

src/main/java/com/zufar/onlinestore/customer/converter/CustomerDtoConverter.java

@@ -9,6 +9,8 @@
 
 import lombok.AllArgsConstructor;
 
+import java.util.UUID;
+
 @Service
 @AllArgsConstructor
 public class CustomerDtoConverter {
@@ -17,7 +19,7 @@ public class CustomerDtoConverter {
 	public CustomerDto convertToDto(final Customer entity) {
 		AddressDto addressDto = addressDtoConverter.convertToDto(entity.getAddress());
 		return CustomerDto.builder()
-				.customerId(entity.getCustomerId())
+				.customerId(entity.getId().toString())
 				.firstName(entity.getFirstName())
 				.lastName(entity.getLastName())
 				.email(entity.getEmail())
@@ -28,11 +30,11 @@ public CustomerDto convertToDto(final Customer entity) {
 	public Customer convertToEntity(final CustomerDto dto) {
 		Address addressDto = addressDtoConverter.convertToEntity(dto.getAddress());
 		return Customer.builder()
-				.customerId(dto.getCustomerId())
+				.id(UUID.fromString(dto.getCustomerId()))
 				.firstName(dto.getFirstName())
 				.lastName(dto.getLastName())
 				.email(dto.getEmail())
 				.address(addressDto)
 				.build();
 	}
-}
+}

src/main/java/com/zufar/onlinestore/customer/endpoint/CustomerEndpoint.java

@@ -17,6 +17,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 
 import static com.zufar.onlinestore.customer.endpoint.UrlConstants.API_CUSTOMERS;
 
@@ -86,10 +87,10 @@ public ResponseEntity<Void> updateCustomer(@PathVariable("id") @NotBlank final S
                                                @RequestBody @Valid @NotNull final CustomerDto updateCustomerRequest) {
         log.info("Received updateCustomerRequest to update the Customer with id - {}, updateCustomerRequest - {}.", customerId, updateCustomerRequest);
         Customer customerEntity = customerDtoConverter.convertToEntity(updateCustomerRequest);
-        customerEntity.setCustomerId(customerId);
+        customerEntity.setId(UUID.fromString(customerId));
         customerCrudRepository.save(customerEntity);
         log.info("the Customer with id - {} was updated.", customerId);
         return ResponseEntity.ok()
                 .build();
     }
-}
+}

src/main/java/com/zufar/onlinestore/customer/entity/Address.java

@@ -11,17 +11,19 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.UUID;
+
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-@Table(name = "addresses")
+@Table(name = "address")
 public class Address {
 
     @Id
     @GeneratedValue(strategy = GenerationType.SEQUENCE)
-    private Long id;
+    private UUID id;
 
     @Column(name = "line", nullable = false)
     private String line;
@@ -31,4 +33,4 @@ public class Address {
 
     @Column(name = "country", nullable = false)
     private  String country;
-}
+}

src/main/java/com/zufar/onlinestore/customer/entity/Customer.java

@@ -14,19 +14,21 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.UUID;
+
 
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
 @Entity
-@Table(name = "customers")
+@Table(name = "customer")
 public class Customer {
 
     @Id
     @Column(nullable = false)
     @GeneratedValue(strategy = GenerationType.SEQUENCE)
-    private String customerId;
+    private UUID id;
 
     @Column(name = "first_name", nullable = false)
     private String firstName;
@@ -41,4 +43,4 @@ public class Customer {
     @JoinColumn(name = "address_id", referencedColumnName = "id")
     private Address address;
 
-}
+}

src/main/java/com/zufar/onlinestore/notification/endpoint/NotificationEndpoint.java

@@ -15,6 +15,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.UUID;
 
 /**
  * @author Alex Zarubin
@@ -82,7 +83,7 @@ public ResponseEntity<Void> updateNotification(@PathVariable("id") String id, @R
                     .build();
         }
         Notification notificationToUpdate = notificationDtoConverter.convertToEntity(request);
-        notificationToUpdate.setId(Integer.parseInt(id));
+        notificationToUpdate.setId(UUID.fromString(id));
         notificationRepository.save(notificationToUpdate);
         log.info("The Notification with id - {} was updated.", id);
         return ResponseEntity.ok().build();
@@ -96,4 +97,4 @@ public ResponseEntity<Void> deleteNotification(@PathVariable("id") String id) {
         return ResponseEntity.ok().build();
     }
 
-}
+}

src/main/java/com/zufar/onlinestore/notification/entity/Notification.java

@@ -1,13 +1,23 @@
 package com.zufar.onlinestore.notification.entity;
 
 import com.zufar.onlinestore.customer.entity.Customer;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.util.UUID;
+
 /**
  * @author Alex Zarubin
  * created on 24.05.2023
@@ -18,13 +28,20 @@
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@Document
+@Entity
+@Table(name = "notification")
 public class Notification {
 
+
     @Id
-    private int id;
+    @Column(nullable = false)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    private UUID id;
 
+    @Column(name = "message")
     private String message;
-    private Customer recipient;
-}
 
+    @OneToOne(cascade = CascadeType.REFRESH)
+    @JoinColumn(name = "recipient_id", referencedColumnName = "id")
+    private Customer recipient;
+}

src/main/java/com/zufar/onlinestore/notification/repository/NotificationRepository.java

@@ -2,10 +2,10 @@
 
 
 import com.zufar.onlinestore.notification.entity.Notification;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface NotificationRepository extends MongoRepository<Notification, Integer> {
-}
-
+public interface NotificationRepository extends JpaRepository<Notification, Integer> {
+}

src/main/java/com/zufar/onlinestore/notification/repository/NotificationsMongoDatabaseInitializer.java

@@ -6,6 +6,8 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.UUID;
+
 /**
  * @author Alex Zarubin
  * created on 27.05.2023
@@ -20,10 +22,10 @@ CommandLineRunner notificationCommandLineRunner(NotificationRepository repositor
         Customer customer = new Customer();
 
         return strings -> {
-            repository.save(new Notification(1, "Notification1", customer));
-            repository.save(new Notification(2, "Notification2", customer));
-            repository.save(new Notification(3, "Notification3", customer));
-            repository.save(new Notification(4, "Notification4", customer));
+            repository.save(new Notification(UUID.randomUUID(), "Notification1", customer));
+            repository.save(new Notification(UUID.randomUUID(), "Notification2", customer));
+            repository.save(new Notification(UUID.randomUUID(), "Notification3", customer));
+            repository.save(new Notification(UUID.randomUUID(), "Notification4", customer));
         };
     }
-}
+}

src/main/java/com/zufar/onlinestore/product/ProductsSumCalculator.java

@@ -1,6 +1,5 @@
 package com.zufar.onlinestore.product;
 
-import com.zufar.onlinestore.product.dto.PriceDto;
 import com.zufar.onlinestore.product.dto.ProductInfoDto;
 
 import org.springframework.stereotype.Service;
@@ -13,8 +12,7 @@ public class ProductsSumCalculator {
 
 	public BigDecimal calculate(final Collection<ProductInfoDto> products) {
 		return products.stream()
-				.map(ProductInfoDto::getPrice)
-				.map(PriceDto::getAmount)
+				.map(ProductInfoDto::price)
 				.reduce(BigDecimal.ZERO, BigDecimal::add);
 	}
-}
+}

src/main/java/com/zufar/onlinestore/product/converter/ProductInfoDtoConverter.java

@@ -2,7 +2,6 @@
 
 import com.zufar.onlinestore.product.dto.ProductInfoDto;
 import com.zufar.onlinestore.product.entity.ProductInfo;
-import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -11,17 +10,19 @@ public class ProductInfoDtoConverter {
     public ProductInfoDto convertToDto(final ProductInfo entity) {
         return ProductInfoDto.builder()
                 .id(entity.getId())
-                .category(entity.getCategory())
+                .description(entity.getDescription())
                 .name(entity.getName())
                 .price(entity.getPrice())
+                .currency(entity.getCurrency())
                 .build();
     }
 
     public ProductInfo convertToEntity(final ProductInfoDto dto) {
         return ProductInfo.builder()
-                .category(dto.getCategory())
-                .name(dto.getName())
-                .price(dto.getPrice())
+                .description(dto.description())
+                .name(dto.name())
+                .price(dto.price())
+                .currency(dto.currency())
                 .build();
     }
 }