Dev to main

.gitignore

@@ -24,3 +24,5 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 replay_pid*
+.env
+*.env

OrariAperti/backend/.run/Backend.run.xml

@@ -0,0 +1,10 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Backend" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
+    <module name="OrariAperti" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="ims.orariaperti.OrariApertiApplication" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

OrariAperti/backend/README.md

@@ -15,14 +15,19 @@ OrariAperti is a room reservation system built with Spring Boot and React.
 
 ### Backend Development
 
-To run the backend only:
+To run the backend:
 
+1. **Copy and Modify the [application.properties](./src/main/resources/application.properties.example)**
 ```bash
-mvn spring-boot:run
+mv ./src/main/resources/application.properties.example ./src/main/resources/application.properties
 ```
 
-and then:
+3. **Build the Application**
+```bash
+mvn spring-boot:run
+```
 
+3. **Run the Application**
 ```bash
 java -jar target/OrariAperti-0.0.1-SNAPSHOT.jar
 ```

OrariAperti/backend/backend-openapi.yaml

@@ -0,0 +1,220 @@
+openapi: "3.1.0"
+info:
+  title: "OrariAperti Backend API"
+  description: "Backend API Description of the OrariAperti application."
+  version: "1.0.0"
+servers:
+  - url: "http://localhost:8080"
+    description: "Local server"
+paths:
+  /api/reservation:
+    get:
+      summary: "Get reservation by key"
+      operationId: "getReservationByKey"
+      parameters: 
+        - name: "publicKey"
+          in: "header"
+          required: false
+          schema:
+            type: "string"
+            format: "uuid"
+        - name: "privateKey"
+          in: "header"
+          required: false
+          schema:
+            type: "string"
+            format: "uuid"
+      responses:
+        "200":
+          description: "Reservation found"
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  reservationDetails:
+                    $ref: "#/components/schemas/Reservation"
+                  privateKey:
+                    type: string
+                    format: uuid
+                  publicKey:
+                    type: string
+                    format: uuid
+        "400":
+          description: "Bad request"
+        "404":
+          description: "Not found"
+    post:
+      summary: "Create a new reservation"
+      operationId: "createReservation"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/ReservationDTO"
+      responses:
+        "200":
+          description: "Reservation created"
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  reservation:
+                    $ref: "#/components/schemas/Reservation"
+                  privateKey:
+                    type: string
+                    format: uuid
+                  publicKey:
+                    type: string
+                    format: uuid
+        "400":
+          description: "Bad request"
+  /api/reservation/{id}:
+    put:
+      summary: "Update a reservation"
+      operationId: "updateReservation"
+      parameters:
+        - name: "id"
+          in: "path"
+          required: true
+          schema:
+            type: "string"
+            format: "uuid"
+        - name: "privateKey"
+          in: "header"
+          required: true
+          schema:
+            type: "string"
+            format: "uuid"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/ReservationDTO"
+      responses:
+        "200":
+          description: "Reservation updated"
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Reservation"
+        "400":
+          description: "Bad request"
+        "401":
+          description: "Unauthorized"
+        "404":
+          description: "Not found"
+    delete:
+      summary: "Delete a reservation"
+      operationId: "deleteReservation"
+      parameters:
+        - name: "id"
+          in: "path"
+          required: true
+          schema:
+            type: "string"
+            format: "uuid"
+        - name: "privateKey"
+          in: "header"
+          required: true
+          schema:
+            type: "string"
+            format: "uuid"
+      responses:
+        "200":
+          description: "Reservation deleted"
+        "401":
+          description: "Unauthorized"
+        "404":
+          description: "Not found"
+  /api/room:
+    get:
+      summary: "Get all rooms"
+      operationId: "getRooms"
+      responses:
+        "200":
+          description: "List of rooms"
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/Room"
+        "404":
+          description: "No rooms found"
+components:
+  schemas:
+    Room:
+      type: object
+      properties:
+        id:
+          type: string
+          format: uuid
+        roomNumber:
+          type: string
+        roomFeatures:
+          type: array
+          items:
+            $ref: "#/components/schemas/RoomFeatures"
+    RoomFeatures:
+      type: string
+      enum:
+        - "Beamer"
+        - "Water Tap"
+        - "Whiteboard"
+        - "Air Conditioning"
+        - "Projector Screen"
+        - "Speaker System"
+        - "Video Conferencing"
+        - "WiFi"
+        - "Power Outlets"
+        - "Natural Light"
+        - "Soundproofing"
+        - "Smart Board"
+        - "Telephone"
+        - "Coffee Machine"
+        - "Printer"
+        - "Lockers"
+    Reservation:
+      type: object
+      properties:
+        id:
+          type: string
+          format: uuid
+        date:
+          type: string
+          format: date
+        startTime:
+          type: string
+          format: partial-time
+        endTime:
+          type: string
+          format: partial-time
+        room:
+          $ref: "#/components/schemas/Room"
+        description:
+          type: string
+        participants:
+          type: string
+    ReservationDTO:
+      type: object
+      properties:
+        date:
+          type: string
+          format: date
+        startTime:
+          type: string
+          format: partial-time
+        endTime:
+          type: string
+          format: partial-time
+        roomId:
+          type: string
+          format: uuid
+        description:
+          type: string
+        participants:
+          type: string

OrariAperti/backend/pom.xml

@@ -27,7 +27,7 @@
         <url/>
     </scm>
     <properties>
-        <java.version>21</java.version>
+        <java.version>17</java.version>
     </properties>
     <dependencies>
         <dependency>

OrariAperti/backend/src/main/java/ims/orariaperti/DTO/ReservationDTO.java

@@ -8,18 +8,18 @@ public class ReservationDTO {
     private LocalDate date;
     private LocalTime startTime;
     private LocalTime endTime;
-    private int room;
+    private UUID roomId;
     private String description;
     private String participants;
 
     public ReservationDTO() {
     }
 
-    public ReservationDTO(LocalDate date, LocalTime startTime, LocalTime endTime, int room, String description, String participants) {
+    public ReservationDTO(LocalDate date, LocalTime startTime, LocalTime endTime, UUID roomId, String description, String participants) {
         this.date = date;
         this.startTime = startTime;
         this.endTime = endTime;
-        this.room = room;
+        this.roomId = roomId;
         this.description = description;
         this.participants = participants;
     }
@@ -48,12 +48,12 @@ public void setEndTime(LocalTime endTime) {
         this.endTime = endTime;
     }
 
-    public int getRoom() {
-        return room;
+    public UUID getRoomId() {
+        return roomId;
     }
 
-    public void setRoom(int room) {
-        this.room = room;
+    public void setRoomId(UUID roomId) {
+        this.roomId = roomId;
     }
 
     public String getDescription() {
@@ -78,7 +78,7 @@ public String toString() {
                 ", date=" + date +
                 ", startTime=" + startTime +
                 ", endTime=" + endTime +
-                ", room=" + room +
+                ", roomId=" + roomId +
                 ", description='" + description + '\'' +
                 ", participants='" + participants + '\'' +
                 '}';

OrariAperti/backend/src/main/java/ims/orariaperti/config/WebConfig.java

@@ -1,25 +1,27 @@
 package ims.orariaperti.config;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.config.annotation.*;
 
 @Configuration
 public class WebConfig implements WebMvcConfigurer {
 
+    @Value("${frontend.url}")
+    private String frontendUrl;
+
     @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        // Serve static resources from the react-app directory
-        registry.addResourceHandler("/**")
-                .addResourceLocations("classpath:/static/react-app/");
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins(frontendUrl, "http://localhost:8080")
+                .allowedMethods("*")
+                .allowedHeaders("*");
     }
-
+    
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
-        // Forward requests to the index.html for client-side routing
-        registry.addViewController("/").setViewName("forward:/index.html");
-        registry.addViewController("/{x:[\\w\\-]+}").setViewName("forward:/index.html");
-        registry.addViewController("/{x:^(?!api$).*$}/**").setViewName("forward:/index.html");
+        registry.addViewController("/").setViewName("redirect:" + frontendUrl);
+        registry.addViewController("/{x:[\\w\\-]+}").setViewName("redirect:" + frontendUrl);
+        registry.addViewController("/{x:^(?!api$).*$}/**").setViewName("redirect:" + frontendUrl);
     }
-}
+}