From 5d1796a7e77f2ab1474658095fe1b6a32418ea09 Mon Sep 17 00:00:00 2001
From: L P S U Kavindu Senarathna <ludantha@isa.ae>
Date: Fri, 23 May 2025 18:22:47 +0530
Subject: [PATCH 1/2] intern last commit

---
 .idea/compiler.xml                            | 15 +++++---
 .idea/gradle.xml                              |  7 +++-
 .idea/misc.xml                                |  4 +-
 .../controllers/PipelineController.java       | 16 ++++----
 .../frameworks/pipeline/Block.java            | 11 ++++++
 .../frameworks/pipeline/Pipe.java             | 25 +++++++++++++
 .../pipelines/PipelineManager.java            | 24 ------------
 .../pipelines/PipelineStep.java               |  5 ---
 .../pipelines/planning/PlanningPipe.java      | 37 +++++++++++++++++++
 .../blocks/DataTransformationBlock.java}      |  8 ++--
 .../blocks/StorageBlock.java}                 |  8 ++--
 .../blocks/ValidationBlock.java}              |  8 ++--
 12 files changed, 107 insertions(+), 61 deletions(-)
 create mode 100644 planning-service/src/main/java/org/example/planningservice/frameworks/pipeline/Block.java
 create mode 100644 planning-service/src/main/java/org/example/planningservice/frameworks/pipeline/Pipe.java
 delete mode 100644 planning-service/src/main/java/org/example/planningservice/pipelines/PipelineManager.java
 delete mode 100644 planning-service/src/main/java/org/example/planningservice/pipelines/PipelineStep.java
 create mode 100644 planning-service/src/main/java/org/example/planningservice/pipelines/planning/PlanningPipe.java
 rename planning-service/src/main/java/org/example/planningservice/pipelines/{steps/DataTransformationStep.java => planning/blocks/DataTransformationBlock.java} (58%)
 rename planning-service/src/main/java/org/example/planningservice/pipelines/{steps/StorageStep.java => planning/blocks/StorageBlock.java} (50%)
 rename planning-service/src/main/java/org/example/planningservice/pipelines/{steps/ValidationStep.java => planning/blocks/ValidationBlock.java} (61%)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index d3d5187..7868fbb 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -10,10 +10,15 @@
         <module name="social-media-service.main" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="travelPlanner" target="17" />
-      <module name="travelPlanner.main" target="17" />
-      <module name="travelPlanner.test" target="17" />
-    </bytecodeTargetLevel>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="planning-service" options="-parameters" />
+      <module name="planning-service.main" options="-parameters" />
+      <module name="planning-service.test" options="-parameters" />
+      <module name="social-media-service" options="-parameters" />
+      <module name="social-media-service.main" options="-parameters" />
+      <module name="social-media-service.test" options="-parameters" />
+    </option>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 22f0805..053c2b2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,8 +4,13 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$/planning-service" />
         <option name="gradleJvm" value="openjdk-23" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$/planning-service" />
+          </set>
+        </option>
       </GradleProjectSettings>
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$/social-media-service" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 03a7185..75a2866 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -2,9 +2,9 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$/social-media-service" />
+    <file type="web" url="file://$PROJECT_DIR$/planning-service" />
   </component>
-  <component name="ProjectRootManager" version="2" default="true">
+  <component name="ProjectRootManager">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/planning-service/src/main/java/org/example/planningservice/controllers/PipelineController.java b/planning-service/src/main/java/org/example/planningservice/controllers/PipelineController.java
index 523804b..74bbb14 100644
--- a/planning-service/src/main/java/org/example/planningservice/controllers/PipelineController.java
+++ b/planning-service/src/main/java/org/example/planningservice/controllers/PipelineController.java
@@ -1,7 +1,8 @@
 package org.example.planningservice.controllers;
 
 import lombok.extern.slf4j.Slf4j;
-import org.example.planningservice.pipelines.PipelineManager;
+import org.example.planningservice.pipelines.planning.PlanningPipe;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,18 +13,15 @@
 @RequestMapping("/pipeline")
 public class PipelineController {
 
-    private final PipelineManager<String> pipelineManager;
-
-    public PipelineController(PipelineManager<String> pipelineManager) {
-        this.pipelineManager = pipelineManager;
-    }
+    @Autowired
+    private PlanningPipe planningPipe;
 
     @PostMapping("/execute")
     public String executePipeline(@RequestBody String input) {
 
-        log.info("🚀 Starting Pipeline...");
-        String result = pipelineManager.execute(input);
-        log.info("🎉 Final Output: " + result);
+        log.info("🚀 Starting Pipeline...\n");
+        String result = planningPipe.execute(input);
+        log.info("\n🎉 Final Output: " + result);
 
         return result;
     }
diff --git a/planning-service/src/main/java/org/example/planningservice/frameworks/pipeline/Block.java b/planning-service/src/main/java/org/example/planningservice/frameworks/pipeline/Block.java
new file mode 100644
index 0000000..d9e4415
--- /dev/null
+++ b/planning-service/src/main/java/org/example/planningservice/frameworks/pipeline/Block.java
@@ -0,0 +1,11 @@
+package org.example.planningservice.frameworks.pipeline;
+
+/**
+ * Represents a processing block in a pipeline.
+ *
+ * @param <I> the input type
+ * @param <O> the output type
+ */
+public interface Block<I, O> {
+    O process(I input);
+}
\ No newline at end of file
diff --git a/planning-service/src/main/java/org/example/planningservice/frameworks/pipeline/Pipe.java b/planning-service/src/main/java/org/example/planningservice/frameworks/pipeline/Pipe.java
new file mode 100644
index 0000000..70d6a9b
--- /dev/null
+++ b/planning-service/src/main/java/org/example/planningservice/frameworks/pipeline/Pipe.java
@@ -0,0 +1,25 @@
+package org.example.planningservice.frameworks.pipeline;
+
+/**
+ * Represents a pipeline.
+ *
+ * @param <I> the input type
+ * @param <O> the output type
+ */
+public class Pipe<I, O> {
+
+    public final Block<I, O> current;
+
+    public Pipe(Block<I, O> current) {
+        this.current = current;
+    }
+
+    public <N0> Pipe<I, N0> connect(Block<O, N0> next) {
+        return new Pipe<>(input -> next.process(current.process(input)));
+    }
+
+    public O execute(I input) {
+        return current.process(input);
+    }
+}
+
diff --git a/planning-service/src/main/java/org/example/planningservice/pipelines/PipelineManager.java b/planning-service/src/main/java/org/example/planningservice/pipelines/PipelineManager.java
deleted file mode 100644
index 5db2e10..0000000
--- a/planning-service/src/main/java/org/example/planningservice/pipelines/PipelineManager.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.example.planningservice.pipelines;
-
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class PipelineManager<T> {
-
-    private final List<PipelineStep<T>> steps;
-
-    public PipelineManager(List<PipelineStep<T>> steps) {
-        this.steps = steps;
-    }
-
-
-    public T execute(T input) {
-        T result = input;
-        for (PipelineStep<T> step : steps) {
-            result = step.process(result);
-        }
-        return result;
-    }
-}
diff --git a/planning-service/src/main/java/org/example/planningservice/pipelines/PipelineStep.java b/planning-service/src/main/java/org/example/planningservice/pipelines/PipelineStep.java
deleted file mode 100644
index c73d79f..0000000
--- a/planning-service/src/main/java/org/example/planningservice/pipelines/PipelineStep.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.example.planningservice.pipelines;
-
-public interface PipelineStep<T> {
-    T process(T input);
-}
\ No newline at end of file
diff --git a/planning-service/src/main/java/org/example/planningservice/pipelines/planning/PlanningPipe.java b/planning-service/src/main/java/org/example/planningservice/pipelines/planning/PlanningPipe.java
new file mode 100644
index 0000000..5e68d1c
--- /dev/null
+++ b/planning-service/src/main/java/org/example/planningservice/pipelines/planning/PlanningPipe.java
@@ -0,0 +1,37 @@
+package org.example.planningservice.pipelines.planning;
+
+import lombok.extern.slf4j.Slf4j;
+import org.example.planningservice.frameworks.pipeline.Pipe;
+import org.example.planningservice.pipelines.planning.blocks.DataTransformationBlock;
+import org.example.planningservice.pipelines.planning.blocks.StorageBlock;
+import org.example.planningservice.pipelines.planning.blocks.ValidationBlock;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class PlanningPipe {
+
+    @Autowired
+    private DataTransformationBlock dataTransformationBlock;
+
+    @Autowired
+    private StorageBlock storageBlock;
+
+    @Autowired
+    private ValidationBlock validationBlock;
+
+    public String execute(String input) {
+        Pipe<String, String> procedurePipe = createProcedurePipe();
+        log.info("=== created the pipeline (not executed yet) ===");
+
+        // Execute the pipeline
+        return procedurePipe.execute(input);
+    }
+
+    private Pipe<String, String> createProcedurePipe() {
+        return new Pipe<>(validationBlock)
+                .connect(dataTransformationBlock)
+                .connect(storageBlock);
+    }
+}
diff --git a/planning-service/src/main/java/org/example/planningservice/pipelines/steps/DataTransformationStep.java b/planning-service/src/main/java/org/example/planningservice/pipelines/planning/blocks/DataTransformationBlock.java
similarity index 58%
rename from planning-service/src/main/java/org/example/planningservice/pipelines/steps/DataTransformationStep.java
rename to planning-service/src/main/java/org/example/planningservice/pipelines/planning/blocks/DataTransformationBlock.java
index cde7538..c3d2e08 100644
--- a/planning-service/src/main/java/org/example/planningservice/pipelines/steps/DataTransformationStep.java
+++ b/planning-service/src/main/java/org/example/planningservice/pipelines/planning/blocks/DataTransformationBlock.java
@@ -1,14 +1,12 @@
-package org.example.planningservice.pipelines.steps;
+package org.example.planningservice.pipelines.planning.blocks;
 
 import lombok.extern.slf4j.Slf4j;
-import org.example.planningservice.pipelines.PipelineStep;
-import org.springframework.core.annotation.Order;
+import org.example.planningservice.frameworks.pipeline.Block;
 import org.springframework.stereotype.Component;
 
 @Slf4j
 @Component
-@Order(2)
-public class DataTransformationStep implements PipelineStep<String> {
+public class DataTransformationBlock implements Block<String, String> {
 
     @Override
     public String process(String input) {
diff --git a/planning-service/src/main/java/org/example/planningservice/pipelines/steps/StorageStep.java b/planning-service/src/main/java/org/example/planningservice/pipelines/planning/blocks/StorageBlock.java
similarity index 50%
rename from planning-service/src/main/java/org/example/planningservice/pipelines/steps/StorageStep.java
rename to planning-service/src/main/java/org/example/planningservice/pipelines/planning/blocks/StorageBlock.java
index 5ffa468..0be4945 100644
--- a/planning-service/src/main/java/org/example/planningservice/pipelines/steps/StorageStep.java
+++ b/planning-service/src/main/java/org/example/planningservice/pipelines/planning/blocks/StorageBlock.java
@@ -1,14 +1,12 @@
-package org.example.planningservice.pipelines.steps;
+package org.example.planningservice.pipelines.planning.blocks;
 
 import lombok.extern.slf4j.Slf4j;
-import org.example.planningservice.pipelines.PipelineStep;
-import org.springframework.core.annotation.Order;
+import org.example.planningservice.frameworks.pipeline.Block;
 import org.springframework.stereotype.Component;
 
 @Slf4j
 @Component
-@Order(3)
-public class StorageStep implements PipelineStep<String> {
+public class StorageBlock implements Block<String, String> {
 
     @Override
     public String process(String input) {
diff --git a/planning-service/src/main/java/org/example/planningservice/pipelines/steps/ValidationStep.java b/planning-service/src/main/java/org/example/planningservice/pipelines/planning/blocks/ValidationBlock.java
similarity index 61%
rename from planning-service/src/main/java/org/example/planningservice/pipelines/steps/ValidationStep.java
rename to planning-service/src/main/java/org/example/planningservice/pipelines/planning/blocks/ValidationBlock.java
index b767118..3a07a42 100644
--- a/planning-service/src/main/java/org/example/planningservice/pipelines/steps/ValidationStep.java
+++ b/planning-service/src/main/java/org/example/planningservice/pipelines/planning/blocks/ValidationBlock.java
@@ -1,14 +1,12 @@
-package org.example.planningservice.pipelines.steps;
+package org.example.planningservice.pipelines.planning.blocks;
 
 import lombok.extern.slf4j.Slf4j;
-import org.example.planningservice.pipelines.PipelineStep;
-import org.springframework.core.annotation.Order;
+import org.example.planningservice.frameworks.pipeline.Block;
 import org.springframework.stereotype.Component;
 
 @Slf4j
 @Component
-@Order(1)
-public class ValidationStep implements PipelineStep<String> {
+public class ValidationBlock implements Block<String, String> {
 
     @Override
     public String process(String input) {

From fc1d7d543be5930f6421de82c8914bf7c2e4815f Mon Sep 17 00:00:00 2001
From: Kavindu Senarathna <senarathnalpsuk.21@uom.lk>
Date: Thu, 12 Jun 2025 09:38:22 +0530
Subject: [PATCH 2/2] spring configs added to the new clone

---
 .idea/GoTogether-backend.iml            |  9 +++++++++
 .idea/compiler.xml                      |  5 +----
 .idea/gradle.xml                        | 11 +----------
 .idea/misc.xml                          |  3 ---
 .idea/modules.xml                       |  9 +++++++++
 .idea/modules/planning-service.main.iml |  8 ++++++++
 6 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 .idea/GoTogether-backend.iml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/modules/planning-service.main.iml

diff --git a/.idea/GoTogether-backend.iml b/.idea/GoTogether-backend.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/GoTogether-backend.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 7868fbb..b6b3b9a 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,7 +7,7 @@
         <processorPath useClasspath="false">
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.36/5a30490a6e14977d97d9c73c924c1f1b5311ea95/lombok-1.18.36.jar" />
         </processorPath>
-        <module name="social-media-service.main" />
+        <module name="planning-service.main" />
       </profile>
     </annotationProcessing>
   </component>
@@ -16,9 +16,6 @@
       <module name="planning-service" options="-parameters" />
       <module name="planning-service.main" options="-parameters" />
       <module name="planning-service.test" options="-parameters" />
-      <module name="social-media-service" options="-parameters" />
-      <module name="social-media-service.main" options="-parameters" />
-      <module name="social-media-service.test" options="-parameters" />
     </option>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 053c2b2..5511078 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,22 +5,13 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$/planning-service" />
-        <option name="gradleJvm" value="openjdk-23" />
+        <option name="gradleJvm" value="17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$/planning-service" />
           </set>
         </option>
       </GradleProjectSettings>
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$/social-media-service" />
-        <option name="gradleJvm" value="openjdk-23" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$/social-media-service" />
-          </set>
-        </option>
-      </GradleProjectSettings>
     </option>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 75a2866..ade1ecd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$/planning-service" />
-  </component>
   <component name="ProjectRootManager">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..246d103
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/GoTogether-backend.iml" filepath="$PROJECT_DIR$/.idea/GoTogether-backend.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/planning-service.main.iml" filepath="$PROJECT_DIR$/.idea/modules/planning-service.main.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules/planning-service.main.iml b/.idea/modules/planning-service.main.iml
new file mode 100644
index 0000000..80e6664
--- /dev/null
+++ b/.idea/modules/planning-service.main.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$/../../planning-service/build/generated/sources/annotationProcessor/java/main">
+      <sourceFolder url="file://$MODULE_DIR$/../../planning-service/build/generated/sources/annotationProcessor/java/main" isTestSource="false" generated="true" />
+    </content>
+  </component>
+</module>
\ No newline at end of file