From 0acfba2520cd06187ba96cbc0c661b8a76471068 Mon Sep 17 00:00:00 2001
From: pikouri <hok@etud.insa-toulouse.fr>
Date: Tue, 11 Jan 2022 16:24:18 +0100
Subject: [PATCH] feat: REST urls for Rooms

---
 .../controller/RoomsServiceController.java    | 18 +++----
 .../fr/insa/arm/RoomsService/model/Room.java  | 48 +++++++++----------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/RoomsService/src/main/java/fr/insa/arm/RoomsService/controller/RoomsServiceController.java b/RoomsService/src/main/java/fr/insa/arm/RoomsService/controller/RoomsServiceController.java
index b82e396..ac23211 100644
--- a/RoomsService/src/main/java/fr/insa/arm/RoomsService/controller/RoomsServiceController.java
+++ b/RoomsService/src/main/java/fr/insa/arm/RoomsService/controller/RoomsServiceController.java
@@ -15,39 +15,39 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/rooms")
 public class RoomsServiceController {
 
-    private INSA rooms = new INSA();
+    private final INSA rooms = new INSA();
     
-    @GetMapping("/roomsManagement")
+    @GetMapping("/")
     public ArrayList<Integer> getIds() {
         return rooms.getIds();
     }
 
-    @PostMapping("/roomsManagement/{name}")
-    public int addRoom(@PathVariable("name") String name) {
+    @PostMapping("/")
+    public int addRoom(@RequestBody String name) {
         return rooms.addRoom(name);
     }
     
-    @DeleteMapping("/roomsManagement/{id}")
+    @DeleteMapping("/{id}")
     public Room removeRoom(@PathVariable("id") int id) {
         return rooms.removeRoom(id);
     }
     
-    @GetMapping("/roomsManagement/{id}")
+    @GetMapping("/{id}")
     public String getRoomName(@PathVariable("id") int id) {
         return rooms.getRoomName(id);
     }
 
-    @PostMapping("/devicesManagement/{id}")
+    @PostMapping("/{id}/devices")
     public boolean affectDevice(@PathVariable("id") int idRoom, @RequestParam String type, @RequestBody Integer idDevice) {
         return rooms.affectDevice(idRoom, type, idDevice);
     }
     
-    @DeleteMapping("/devicesManagement/{id}")
+    @DeleteMapping("/{id}/devices")
     public boolean removeDevice(@PathVariable("id") int idRoom, @RequestParam String type, @RequestBody Integer idDevice) {
         return rooms.removeDevice(idRoom, type, idDevice);
     }
 
-    @GetMapping("/devicesManagement/{id}")
+    @GetMapping("/{id}/devices")
     public ArrayList<Integer> getIdsDevice(@PathVariable("id") int idRoom, @RequestParam String type) {
         return rooms.getIdsDevice(idRoom, type);
     }
diff --git a/RoomsService/src/main/java/fr/insa/arm/RoomsService/model/Room.java b/RoomsService/src/main/java/fr/insa/arm/RoomsService/model/Room.java
index 1999ddf..5409086 100644
--- a/RoomsService/src/main/java/fr/insa/arm/RoomsService/model/Room.java
+++ b/RoomsService/src/main/java/fr/insa/arm/RoomsService/model/Room.java
@@ -5,35 +5,35 @@ import java.util.ArrayList;
 public class Room {
 	
 	static int compteur = 0;
-	private int id;
-	private String name;
-	private ArrayList<Integer> temperatureSensors;
-	private ArrayList<Integer> lightSensors;
-	private ArrayList<Integer> co2Sensors;
-	private ArrayList<Integer> gazSensors;
-	private ArrayList<Integer> studentCounters;
-	private ArrayList<Integer> doorActuator;
-	private ArrayList<Integer> windowActuator;
-	private ArrayList<Integer> alarmActuator;
-	private ArrayList<Integer> heatingActuator;
-	private ArrayList<Integer> climActuator;
-	private ArrayList<Integer> lightActuator;
+	private final int id;
+	private final String name;
+	private final ArrayList<Integer> temperatureSensors;
+	private final ArrayList<Integer> lightSensors;
+	private final ArrayList<Integer> co2Sensors;
+	private final ArrayList<Integer> gazSensors;
+	private final ArrayList<Integer> studentCounters;
+	private final ArrayList<Integer> doorActuator;
+	private final ArrayList<Integer> windowActuator;
+	private final ArrayList<Integer> alarmActuator;
+	private final ArrayList<Integer> heatingActuator;
+	private final ArrayList<Integer> climActuator;
+	private final ArrayList<Integer> lightActuator;
 	
 	public Room(String name) {
 		this.id = Room.compteur;
 		Room.compteur++;
 		this.name = name;
-		temperatureSensors = new ArrayList<Integer>();
-		lightSensors = new ArrayList<Integer>();
-		co2Sensors = new ArrayList<Integer>();
-		gazSensors = new ArrayList<Integer>();
-		studentCounters = new ArrayList<Integer>();
-		doorActuator = new ArrayList<Integer>();
-		windowActuator = new ArrayList<Integer>();
-		alarmActuator = new ArrayList<Integer>();
-		heatingActuator = new ArrayList<Integer>();
-		climActuator = new ArrayList<Integer>();
-		lightActuator = new ArrayList<Integer>();
+		temperatureSensors = new ArrayList<>();
+		lightSensors = new ArrayList<>();
+		co2Sensors = new ArrayList<>();
+		gazSensors = new ArrayList<>();
+		studentCounters = new ArrayList<>();
+		doorActuator = new ArrayList<>();
+		windowActuator = new ArrayList<>();
+		alarmActuator = new ArrayList<>();
+		heatingActuator = new ArrayList<>();
+		climActuator = new ArrayList<>();
+		lightActuator = new ArrayList<>();
 	}
 	
 	public int getId() {