code refactoring

base-domain/src/main/java/com/ubeydekara/basedomain/payload/EmailPayload.java → base-domain/src/main/java/com/ubeydekara/base/payload/EmailPayload.java

@@ -1,4 +1,4 @@
-package com.ubeydekara.basedomain.payload;
+package com.ubeydekara.base.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

base-domain/src/main/java/com/ubeydekara/basedomain/payload/StockPayload.java → base-domain/src/main/java/com/ubeydekara/base/payload/StockPayload.java

@@ -1,4 +1,4 @@
-package com.ubeydekara.basedomain.payload;
+package com.ubeydekara.base.payload;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

base-domain/src/main/java/com/ubeydekara/basedomain/response/ResponseHandler.java → base-domain/src/main/java/com/ubeydekara/base/response/ResponseHandler.java

@@ -1,4 +1,4 @@
-package com.ubeydekara.basedomain.response;
+package com.ubeydekara.base.response;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

discovery-service/src/main/java/com/ubeydekara/discoveryservice/DiscoveryApplication.java → discovery-service/src/main/java/com/ubeydekara/discovery/DiscoveryApplication.java

@@ -1,4 +1,4 @@
-package com.ubeydekara.discoveryservice;
+package com.ubeydekara.discovery;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

docker-compose.yml

@@ -63,7 +63,6 @@ services:
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
       KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
       KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
-
     networks:
       - spring
 

email-service/src/main/java/com/ubeydekara/emailservice/EmailApplication.java → email-service/src/main/java/com/ubeydekara/email/EmailApplication.java

@@ -1,11 +1,11 @@
-package com.ubeydekara.emailservice;
+package com.ubeydekara.email;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 @SpringBootApplication(scanBasePackages = {
-        "com.ubeydekara.emailservice",
+        "com.ubeydekara.email",
         "com.ubeydekara.kafka"}
 )
 @EnableDiscoveryClient

email-service/src/main/java/com/ubeydekara/emailservice/controller/EmailController.java → email-service/src/main/java/com/ubeydekara/email/controller/EmailController.java

@@ -1,9 +1,9 @@
-package com.ubeydekara.emailservice.controller;
+package com.ubeydekara.email.controller;
 
-import com.ubeydekara.basedomain.payload.EmailPayload;
-import com.ubeydekara.basedomain.response.ResponseHandler;
-import com.ubeydekara.emailservice.model.Email;
-import com.ubeydekara.emailservice.service.EmailService;
+import com.ubeydekara.base.payload.EmailPayload;
+import com.ubeydekara.base.response.ResponseHandler;
+import com.ubeydekara.email.model.Email;
+import com.ubeydekara.email.service.EmailService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

email-service/src/main/java/com/ubeydekara/emailservice/model/Email.java → email-service/src/main/java/com/ubeydekara/email/model/Email.java

@@ -1,4 +1,4 @@
-package com.ubeydekara.emailservice.model;
+package com.ubeydekara.email.model;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;

email-service/src/main/java/com/ubeydekara/emailservice/repository/EmailRepository.java → email-service/src/main/java/com/ubeydekara/email/repository/EmailRepository.java

@@ -1,6 +1,6 @@
-package com.ubeydekara.emailservice.repository;
+package com.ubeydekara.email.repository;
 
-import com.ubeydekara.emailservice.model.Email;
+import com.ubeydekara.email.model.Email;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.UUID;

email-service/src/main/java/com/ubeydekara/email/service/EmailService.java

@@ -0,0 +1,12 @@
+package com.ubeydekara.email.service;
+
+import com.ubeydekara.base.payload.EmailPayload;
+import com.ubeydekara.email.model.Email;
+
+import java.util.List;
+
+public interface EmailService {
+    List<Email> getAll();
+
+    Email send(EmailPayload emailPayload);
+}

email-service/src/main/java/com/ubeydekara/emailservice/service/EmailServiceImpl.java → email-service/src/main/java/com/ubeydekara/email/service/EmailServiceImpl.java

@@ -1,8 +1,8 @@
-package com.ubeydekara.emailservice.service;
+package com.ubeydekara.email.service;
 
-import com.ubeydekara.basedomain.payload.EmailPayload;
-import com.ubeydekara.emailservice.model.Email;
-import com.ubeydekara.emailservice.repository.EmailRepository;
+import com.ubeydekara.base.payload.EmailPayload;
+import com.ubeydekara.email.model.Email;
+import com.ubeydekara.email.repository.EmailRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -11,6 +11,7 @@
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Slf4j
@@ -29,7 +30,7 @@ public List<Email> getAll() {
         return emailRepository.findAll();
     }
 
-    @KafkaListener(topics = "order-email", groupId = "foo")
+    @KafkaListener(topics = "email", groupId = "order")
     public Email send(EmailPayload emailPayload)
     {
         try {
@@ -60,6 +61,7 @@ private Email create(EmailPayload emailPayload) {
                                 emailPayload.getProduct(),
                                 emailPayload.getOrderID())
                 )
+                .dateTime(LocalDateTime.now())
                 .build();
     }
 

email-service/src/main/resources/application.yml

@@ -31,9 +31,6 @@ spring:
     password: <your-password>
     port: 587
 
-  profiles:
-    active: default
-
   kafka:
     bootstrap-servers: http://localhost:9092
 

gateway-service/src/main/java/com/ubeydekara/gateservice/GatewayApplication.java → gateway-service/src/main/java/com/ubeydekara/gateway/GatewayApplication.java

@@ -1,4 +1,4 @@
-package com.ubeydekara.gateservice;
+package com.ubeydekara.gateway;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

gateway-service/src/main/resources/application-docker.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: gate-service
+    name: gateway-service
 
   cloud:
     gateway:

gateway-service/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   application:
-    name: gate-service
+    name: gateway-service
 
   cloud:
     gateway:

kafka-config/src/main/java/com/ubeydekara/kafka/config/KafkaTopicConfig.java

@@ -10,13 +10,13 @@ public class KafkaTopicConfig {
 
     @Bean
     public NewTopic orderEmailTopic() {
-        return TopicBuilder.name("order-email")
+        return TopicBuilder.name("email")
                 .build();
     }
 
     @Bean
     public NewTopic orderStockTopic() {
-        return TopicBuilder.name("order-stock")
+        return TopicBuilder.name("stock")
                 .build();
     }
 }

order-service/src/main/java/com/ubeydekara/orderservice/OrderApplication.java → order-service/src/main/java/com/ubeydekara/order/OrderApplication.java

@@ -1,11 +1,11 @@
-package com.ubeydekara.orderservice;
+package com.ubeydekara.order;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 @SpringBootApplication(scanBasePackages = {
-        "com.ubeydekara.orderservice",
+        "com.ubeydekara.order",
         "com.ubeydekara.kafka"}
 )
 @EnableDiscoveryClient

order-service/src/main/java/com/ubeydekara/orderservice/controller/OrderController.java → order-service/src/main/java/com/ubeydekara/order/controller/OrderController.java

@@ -1,9 +1,9 @@
-package com.ubeydekara.orderservice.controller;
+package com.ubeydekara.order.controller;
 
-import com.ubeydekara.basedomain.response.ResponseHandler;
-import com.ubeydekara.orderservice.model.Order;
-import com.ubeydekara.orderservice.request.OrderRequest;
-import com.ubeydekara.orderservice.service.OrderService;
+import com.ubeydekara.base.response.ResponseHandler;
+import com.ubeydekara.order.model.Order;
+import com.ubeydekara.order.request.OrderRequest;
+import com.ubeydekara.order.service.OrderService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;

order-service/src/main/java/com/ubeydekara/orderservice/model/Order.java → order-service/src/main/java/com/ubeydekara/order/model/Order.java

@@ -1,4 +1,4 @@
-package com.ubeydekara.orderservice.model;
+package com.ubeydekara.order.model;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;

order-service/src/main/java/com/ubeydekara/orderservice/repository/OrderRepository.java → order-service/src/main/java/com/ubeydekara/order/repository/OrderRepository.java

@@ -1,6 +1,6 @@
-package com.ubeydekara.orderservice.repository;
+package com.ubeydekara.order.repository;
 
-import com.ubeydekara.orderservice.model.Order;
+import com.ubeydekara.order.model.Order;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.UUID;

order-service/src/main/java/com/ubeydekara/orderservice/request/OrderRequest.java → order-service/src/main/java/com/ubeydekara/order/request/OrderRequest.java

@@ -1,4 +1,4 @@
-package com.ubeydekara.orderservice.request;
+package com.ubeydekara.order.request;
 
 import lombok.Data;
 

order-service/src/main/java/com/ubeydekara/order/service/OrderService.java

@@ -0,0 +1,12 @@
+package com.ubeydekara.order.service;
+
+import com.ubeydekara.order.model.Order;
+import com.ubeydekara.order.request.OrderRequest;
+
+import java.util.List;
+
+public interface OrderService {
+    List<Order> getAll();
+    Order create(OrderRequest orderRequest);
+
+}

order-service/src/main/java/com/ubeydekara/orderservice/service/OrderServiceImpl.java → order-service/src/main/java/com/ubeydekara/order/service/OrderServiceImpl.java

@@ -1,11 +1,11 @@
-package com.ubeydekara.orderservice.service;
+package com.ubeydekara.order.service;
 
-import com.ubeydekara.basedomain.payload.EmailPayload;
-import com.ubeydekara.basedomain.payload.StockPayload;
+import com.ubeydekara.base.payload.EmailPayload;
+import com.ubeydekara.base.payload.StockPayload;
 import com.ubeydekara.kafka.service.ProducerService;
-import com.ubeydekara.orderservice.model.Order;
-import com.ubeydekara.orderservice.repository.OrderRepository;
-import com.ubeydekara.orderservice.request.OrderRequest;
+import com.ubeydekara.order.model.Order;
+import com.ubeydekara.order.repository.OrderRepository;
+import com.ubeydekara.order.request.OrderRequest;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -49,7 +49,7 @@ private void notifyStock(Order order) {
                 .product(order.getProduct())
                 .quantity(order.getQuantity())
                 .build();
-        producerService.sendMessage("order-stock", stockPayload);
+        producerService.sendMessage("stock", stockPayload);
     }
 
     /**
@@ -64,6 +64,6 @@ private void notifyEmail(Order order) {
                 .orderID(order.getOrderID())
                 .product(order.getProduct())
                 .build();
-        producerService.sendMessage("order-email", emailPayload);
+        producerService.sendMessage("email", emailPayload);
     }
 }

order-service/src/main/resources/application.yml

@@ -19,9 +19,6 @@ spring:
         format_sql: true
         show-sql: true
 
-  profiles:
-    active: default
-
   kafka:
     bootstrap-servers: http://localhost:9092
 

readme.md

@@ -26,4 +26,10 @@ $ mvn clean package -Pbuild-image
 Then run all the containers with `docker-compose`:
 ```shell
 $ docker-compose up
-```
+```
+
+### TODO
+- Config Server
+- Kafka Streams
+- Kubernetes
+- JUnit Testing with Mockito

stock-service/src/main/java/com/ubeydekara/stock/controller/StockController.java

@@ -1,7 +1,7 @@
 package com.ubeydekara.stock.controller;
 
-import com.ubeydekara.basedomain.payload.StockPayload;
-import com.ubeydekara.basedomain.response.ResponseHandler;
+import com.ubeydekara.base.payload.StockPayload;
+import com.ubeydekara.base.response.ResponseHandler;
 import com.ubeydekara.stock.model.Stock;
 import com.ubeydekara.stock.response.StockResponse;
 import com.ubeydekara.stock.service.StockService;

stock-service/src/main/java/com/ubeydekara/stock/mapper/StockMapper.java

@@ -1,6 +1,6 @@
 package com.ubeydekara.stock.mapper;
 
-import com.ubeydekara.basedomain.payload.StockPayload;
+import com.ubeydekara.base.payload.StockPayload;
 import com.ubeydekara.stock.model.Stock;
 import org.springframework.stereotype.Component;
 

stock-service/src/main/java/com/ubeydekara/stock/service/StockService.java

@@ -1,6 +1,6 @@
 package com.ubeydekara.stock.service;
 
-import com.ubeydekara.basedomain.payload.StockPayload;
+import com.ubeydekara.base.payload.StockPayload;
 import com.ubeydekara.stock.model.Stock;
 import com.ubeydekara.stock.response.StockResponse;