From 87829a7766217e03f0b71eae4701dbcf11942ed2 Mon Sep 17 00:00:00 2001
From: Yohan Boujon <yo.boujon@gmail.com>
Date: Sun, 22 Dec 2024 16:08:48 +0100
Subject: [PATCH] Added status for posts in `init.sql`. Renamed administration
 section because it does not run any rest API.

---
 db/init.sql                                              | 8 ++++++++
 .../{administration-service => administration}/pom.xml   | 2 +-
 .../application/helpapp/rest/AdministrationService.java  | 0
 .../java/insa/application/helpapp/rest/Connection.java   | 0
 .../application/helpapp/rest/ConnectionRepository.java   | 0
 helpapp-backend/pom.xml                                  | 4 ++--
 .../helpapp/rest/RequestServiceApplication.java          | 9 ++++-----
 7 files changed, 15 insertions(+), 8 deletions(-)
 rename helpapp-backend/{administration-service => administration}/pom.xml (96%)
 rename helpapp-backend/{administration-service => administration}/src/main/java/insa/application/helpapp/rest/AdministrationService.java (100%)
 rename helpapp-backend/{administration-service => administration}/src/main/java/insa/application/helpapp/rest/Connection.java (100%)
 rename helpapp-backend/{administration-service => administration}/src/main/java/insa/application/helpapp/rest/ConnectionRepository.java (100%)

diff --git a/db/init.sql b/db/init.sql
index af6c6cf..4c8742a 100644
--- a/db/init.sql
+++ b/db/init.sql
@@ -3,3 +3,11 @@ VALUES
     (1, 'User'),
     (2, 'Volunteer'),
     (3, 'Admin');
+
+INSERT INTO `service-architecture`.status (id, name)
+VALUES
+    (1, 'Waiting'),
+    (2, 'Validated'),
+    (3, 'Rejected'),
+    (4, 'Chosen'),
+    (5, 'Finished');
\ No newline at end of file
diff --git a/helpapp-backend/administration-service/pom.xml b/helpapp-backend/administration/pom.xml
similarity index 96%
rename from helpapp-backend/administration-service/pom.xml
rename to helpapp-backend/administration/pom.xml
index 014095e..9717a48 100644
--- a/helpapp-backend/administration-service/pom.xml
+++ b/helpapp-backend/administration/pom.xml
@@ -5,7 +5,7 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>administration-service</artifactId>
+    <artifactId>administration</artifactId>
     <packaging>jar</packaging>
 
     <dependencies>
diff --git a/helpapp-backend/administration-service/src/main/java/insa/application/helpapp/rest/AdministrationService.java b/helpapp-backend/administration/src/main/java/insa/application/helpapp/rest/AdministrationService.java
similarity index 100%
rename from helpapp-backend/administration-service/src/main/java/insa/application/helpapp/rest/AdministrationService.java
rename to helpapp-backend/administration/src/main/java/insa/application/helpapp/rest/AdministrationService.java
diff --git a/helpapp-backend/administration-service/src/main/java/insa/application/helpapp/rest/Connection.java b/helpapp-backend/administration/src/main/java/insa/application/helpapp/rest/Connection.java
similarity index 100%
rename from helpapp-backend/administration-service/src/main/java/insa/application/helpapp/rest/Connection.java
rename to helpapp-backend/administration/src/main/java/insa/application/helpapp/rest/Connection.java
diff --git a/helpapp-backend/administration-service/src/main/java/insa/application/helpapp/rest/ConnectionRepository.java b/helpapp-backend/administration/src/main/java/insa/application/helpapp/rest/ConnectionRepository.java
similarity index 100%
rename from helpapp-backend/administration-service/src/main/java/insa/application/helpapp/rest/ConnectionRepository.java
rename to helpapp-backend/administration/src/main/java/insa/application/helpapp/rest/ConnectionRepository.java
diff --git a/helpapp-backend/pom.xml b/helpapp-backend/pom.xml
index df77397..e6ee6db 100644
--- a/helpapp-backend/pom.xml
+++ b/helpapp-backend/pom.xml
@@ -7,8 +7,8 @@
     <packaging>pom</packaging>
 
     <modules>
-        <!-- Administation-Service creates a dependency for other services -->
-        <module>administration-service</module>
+        <!-- Administation creates a dependency for other services -->
+        <module>administration</module>
         <module>request-service</module>
         <module>role-service</module>
         <module>user-service</module>
diff --git a/helpapp-backend/request-service/src/main/java/insa/application/helpapp/rest/RequestServiceApplication.java b/helpapp-backend/request-service/src/main/java/insa/application/helpapp/rest/RequestServiceApplication.java
index 47536ef..7968774 100644
--- a/helpapp-backend/request-service/src/main/java/insa/application/helpapp/rest/RequestServiceApplication.java
+++ b/helpapp-backend/request-service/src/main/java/insa/application/helpapp/rest/RequestServiceApplication.java
@@ -1,17 +1,14 @@
 package insa.application.helpapp.rest;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-// import org.springframework.http.HttpStatus;
-// import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-// import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Autowired;
 
 @SpringBootApplication
 @RestController
@@ -40,6 +37,8 @@ public class RequestServiceApplication {
         if(!administrationService.checkToken(idUser, token)) {
             return ResponseEntity.status(HttpStatus.FORBIDDEN).body("User or token invalid.");
         };
-        return ResponseEntity.ok("yessay");
+
+        
+        return ResponseEntity.ok("Message posted");
     }
 }