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 @@ 1.0-SNAPSHOT 4.0.0 - administration-service + administration jar 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 @@ pom - - administration-service + + administration request-service role-service user-service 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"); } }