Branch with counter

src/main/java/com/example/demo/DemoApplication.java

@@ -4,12 +4,15 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
+
+
 @SpringBootApplication
 @EnableJpaAuditing
 public class DemoApplication {
 
-    public static void main(String[] args) {
-        SpringApplication.run(DemoApplication.class, args);
-    }
+     public static void main(String[] args) {
+          SpringApplication.run(DemoApplication.class, args);
+     }
+
 
 }

src/main/java/com/example/demo/controller/ProductController.java

@@ -6,7 +6,11 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 
 @RestController
 @RequestMapping("/api/v1")
@@ -17,11 +21,19 @@ public class ProductController {
     private final ProductFacade productFacade;
 
     @PostMapping("/create-product")
-    public ResponseEntity<ResponseMessage> createProduct(@RequestBody ProductDto productDto) {
+    public ResponseEntity<ResponseMessage> countProduct(@RequestBody ProductDto productDto) {
         log.info("Posting a new product with {} id", productDto.getName());
         var result = productFacade.countProducts(productDto);
         log.info("Posting is done with status {}", result.getHttpStatus());
         return ResponseEntity.status(result.getHttpStatus()).body(result);
     }
 
+    @PostMapping("/new-product")
+    public ResponseEntity<ResponseMessage> createProduct(@RequestBody ProductDto productDto) {
+        log.info("Posting a new product with {} id", productDto.getName());
+        var result = productFacade.createNewProduct(productDto);
+        log.info("Posting is done with status {}", result.getHttpStatus());
+        return ResponseEntity.status(result.getHttpStatus()).body(result);
+    }
+
 }

src/main/java/com/example/demo/dto/ProductDto.java

@@ -6,6 +6,7 @@
 
 import java.util.Objects;
 
+
 @Data
 //@EqualsAndHashCode
 @JsonInclude(JsonInclude.Include.NON_NULL)

src/main/java/com/example/demo/entity/Product.java

@@ -11,6 +11,7 @@
 
 import java.util.Objects;
 
+
 @Getter
 @Setter
 @ToString
@@ -21,7 +22,7 @@
 public class Product {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
     private Long productId;
 
     @Column(name = "product_name", length = 20)
@@ -40,6 +41,6 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return getClass().hashCode();
+        return Objects.hash(getName(), getDescription());
     }
 }

src/main/java/com/example/demo/exceptions/ExceptionHandlers.java

@@ -4,16 +4,24 @@
 import com.example.demo.response.ResponseMessage;
 import com.example.demo.service.ProductCounterService;
 import org.hibernate.JDBCException;
+import org.hibernate.query.QueryTypeMismatchException;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
+
 @RestControllerAdvice
 @Order(Ordered.HIGHEST_PRECEDENCE)
 public class ExceptionHandlers {
 
+    @ExceptionHandler(QueryTypeMismatchException.class)
+    public ResponseEntity<ResponseMessage> queryTypeMismatchException(Exception exception) {
+        var errorResult = new ResponseMessage(ErrorCategory.QUERY_TYPE_ERROR.errorDto(), ProductCounterService.getProductCountSize());
+        return ResponseEntity.status(errorResult.getHttpStatus()).body(errorResult);
+    }
+
     @ExceptionHandler(JDBCException.class)
     public ResponseEntity<ResponseMessage> internalServerExceptionsHandler(Exception exception) {
         var errorResult = new ResponseMessage(ErrorCategory.NAME_NOT_ALLOWED.errorDto(), ProductCounterService.getProductCountSize());

src/main/java/com/example/demo/facade/ProductFacade.java

@@ -1,6 +1,7 @@
 package com.example.demo.facade;
 
 import com.example.demo.dto.ProductDto;
+import com.example.demo.metrics.MetricServiceCounter;
 import com.example.demo.response.ErrorCategory;
 import com.example.demo.response.ResponseMessage;
 import com.example.demo.service.ProductCounterService;
@@ -9,26 +10,37 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+
 @Service
 @RequiredArgsConstructor
 @Slf4j
 public class ProductFacade implements ProductUniquenessFacade {
 
     private final ProductService productService;
+    private final MetricServiceCounter metricServiceCounter;
 
 
     @Override
     public ResponseMessage countProducts(ProductDto productDto) {
         log.info("Checking if the product is unique in the in memory counter {}", productDto.getName());
         var productCounter = ProductCounterService.getProductCounter();
 
-        if (!productCounter.contains(productDto.hashCode())) {
+        if (!productCounter.contains(productDto.getName())) {
             log.info("Product is counted: product is in the db and in the inMemory counter: name={}", productDto.getName());
             var savedProduct = productService.persistProduct(productDto);
+
             return new ResponseMessage(ErrorCategory.UNIQUE.errorDto(), savedProduct, ProductCounterService.getProductCountSize());
         } else {
             log.warn("Product is not counted: product either no in the db or in the in memory counter: name={}", productDto.getName());
             return new ResponseMessage(ErrorCategory.DUPLICATED_PRODUCT.errorDto(), ProductCounterService.getProductCountSize());
         }
     }
+
+    @Override
+    public ResponseMessage createNewProduct(ProductDto productDto) {
+        ProductDto entity = productService.postProduct(productDto);
+        return new ResponseMessage(ErrorCategory.UNIQUE.errorDto(), entity, ProductCounterService.getProductCountSize());
+    }
+
+
 }

src/main/java/com/example/demo/facade/ProductUniquenessFacade.java

@@ -3,9 +3,12 @@
 import com.example.demo.dto.ProductDto;
 import com.example.demo.response.ResponseMessage;
 
-public interface ProductUniquenessFacade {
+
+interface ProductUniquenessFacade {
 
     ResponseMessage countProducts(ProductDto productDto);
 
+    ResponseMessage createNewProduct(ProductDto productDto);
+
 
 }

src/main/java/com/example/demo/listeners/ProductCounterListener.java

@@ -3,7 +3,6 @@
 import com.example.demo.entity.Product;
 import com.example.demo.mapper.Map;
 import com.example.demo.service.ProductCounterService;
-import com.example.demo.service.ProductService;
 import jakarta.persistence.PostPersist;
 import lombok.extern.slf4j.Slf4j;
 
@@ -16,7 +15,7 @@ void postPersistProductCounter(Object productDto) {
         var counter = ProductCounterService.getProductCounter();
         if (productDto instanceof Product product) {
             var entity = Map.INSTANCE.fromProduct(product);
-            counter.add(entity.hashCode());
+            counter.add(entity.getName());
             log.info("Product name={} is added into the inMemory db!", product.getName());
         }
     }

src/main/java/com/example/demo/mapper/Map.java

@@ -9,6 +9,7 @@
 @Mapper(componentModel = "spring")
 public interface Map {
     Map INSTANCE = Mappers.getMapper(Map.class);
+
     @Mapping(target = "productId", ignore = true)
     Product toProduct(ProductDto productDto);
 

src/main/java/com/example/demo/metrics/MetricServiceCounter.java

@@ -0,0 +1,23 @@
+package com.example.demo.metrics;
+
+
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.MeterRegistry;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MetricServiceCounter {
+
+    private final Counter count;
+
+    public MetricServiceCounter(MeterRegistry registry) {
+        this.count = Counter.builder("myCounter")
+                .tag("product", "counter")
+                .register(registry);
+    }
+
+    public void processRequest() {
+        this.count.increment();
+
+    }
+}

src/main/java/com/example/demo/metrics/MetricsService.java → src/main/java/com/example/demo/metrics/MetricsServiceGauge.java

@@ -1,8 +1,6 @@
 package com.example.demo.metrics;
 
-import com.example.demo.facade.ProductFacade;
 import com.example.demo.service.ProductCounterService;
-import com.example.demo.service.ProductService;
 import io.micrometer.core.instrument.Gauge;
 import io.micrometer.core.instrument.MeterRegistry;
 import lombok.extern.slf4j.Slf4j;
@@ -12,17 +10,18 @@
 
 @Component
 @Slf4j
-public class MetricsService {
+public class MetricsServiceGauge {
 
-    public Supplier<Number> fetchProductCount(){
-        return ProductCounterService::getProductCountSize;
-    }
-    public MetricsService(MeterRegistry registry) {
+    public MetricsServiceGauge(MeterRegistry registry) {
         log.info("Registering product countMetric into the Prometheus.");
         Gauge.builder("product_counter", fetchProductCount())
                 .strongReference(true)
                 .tag("product", "counter")
                 .register(registry);
         log.info("CounterMetric is already registered in the Prometheus.");
     }
+
+    public Supplier<Number> fetchProductCount() {
+        return ProductCounterService::getProductCountSize;
+    }
 }

src/main/java/com/example/demo/repository/ProductRepository.java

@@ -4,6 +4,11 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.Optional;
+
+
 @Repository
 public interface ProductRepository extends JpaRepository<Product, Long> {
+    Optional<Product> findProductByNameAndAndDescription(String name, String description);
+
 }

src/main/java/com/example/demo/response/AbstractProductErrorResponse.java

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
+
 @Data
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public abstract class AbstractProductErrorResponse {

src/main/java/com/example/demo/response/ErrorCategory.java

@@ -3,10 +3,12 @@
 import lombok.Getter;
 import org.springframework.http.HttpStatus;
 
+
 @Getter
 public enum ErrorCategory {
     DUPLICATED_PRODUCT("Such a product exists already", HttpStatus.NOT_ACCEPTABLE),
     NAME_NOT_ALLOWED("The product name length should not be greater than 20", HttpStatus.INTERNAL_SERVER_ERROR),
+    QUERY_TYPE_ERROR("Specified result type did not match Query selection type", HttpStatus.INTERNAL_SERVER_ERROR),
     UNIQUE("The product is unique", HttpStatus.OK);
 
     private final String id;
@@ -16,6 +18,7 @@ public enum ErrorCategory {
         this.id = s;
         this.httpStatus = httpStatus;
     }
+
     public ErrorDto errorDto() {
         return new ErrorDto(getId(), name(), getHttpStatus());
     }

src/main/java/com/example/demo/response/ErrorDto.java

@@ -2,9 +2,13 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.springframework.http.HttpStatus;
 
+
 @Getter
 @Setter
 @NoArgsConstructor

src/main/java/com/example/demo/response/ResponseMessage.java

@@ -6,10 +6,11 @@
 import lombok.Getter;
 import lombok.Setter;
 
+
 @Getter
 @Setter
 @EqualsAndHashCode(callSuper = true)
-public class ResponseMessage extends AbstractProductErrorResponse{
+public class ResponseMessage extends AbstractProductErrorResponse {
 
 
     @JsonProperty("body")
@@ -18,11 +19,12 @@ public class ResponseMessage extends AbstractProductErrorResponse{
     @JsonProperty(value = "productCounter")
     private Number productCounter;
 
-    public ResponseMessage(final ErrorDto error, Number productCounter){
+    public ResponseMessage(final ErrorDto error, Number productCounter) {
         super(error);
         this.productCounter = productCounter;
     }
-    public ResponseMessage(final ErrorDto error, ProductDto body, int productCounter){
+
+    public ResponseMessage(final ErrorDto error, ProductDto body, int productCounter) {
         super(error);
         this.body = body;
         this.productCounter = productCounter;

src/main/java/com/example/demo/service/ProductCounterService.java

@@ -7,19 +7,20 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+
 @RequiredArgsConstructor
 @Slf4j
 @Service
 public class ProductCounterService {
 
-    private static final Set<Integer> productCounter = ConcurrentHashMap.newKeySet();
+    private static final Set<String> productCounter = ConcurrentHashMap.newKeySet();
 
 
     public static Integer getProductCountSize() {
         return productCounter.size();
     }
 
-    public static Set<Integer> getProductCounter() {
+    public static Set<String> getProductCounter() {
         return productCounter;
     }
 

src/main/java/com/example/demo/service/ProductDomainService.java

@@ -2,6 +2,8 @@
 
 import com.example.demo.dto.ProductDto;
 
+
 public interface ProductDomainService {
     ProductDto persistProduct(ProductDto productDto);
+    ProductDto postProduct(ProductDto productDto);
 }