Merge pull request #26 from fix/some-bugs

Author: swyth-dev

backend/emergency-service/src/main/resources/application.yaml

@@ -46,10 +46,13 @@ spring:
     producer:
       retries: 5               # Retries on transient errors
       bootstrap-servers: 'kafka:9092'
-      acks: all
-      retry.backoff.ms: 300    # Wait before retrying
-      reconnect.backoff.ms: 50 # Delay before reconnecting to Kafka
-      linger.ms: 5             # Reduce latency impact
+      properties:
+        enable.idempotence: true
+        max.in.flight.requests.per.connection: 5
+        acks: all
+        retry.backoff.ms: 300    # Wait before retrying
+        reconnect.backoff.ms: 50 # Delay before reconnecting to Kafka
+        linger.ms: 5             # Reduce latency impact
     retry:
       topic:
         backoff:

backend/hospital-service/pom.xml

@@ -149,6 +149,7 @@
                         <path>
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok</artifactId>
+                            <version>1.18.36</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>

backend/hospital-service/src/main/java/com/swyth/hospitalservice/entity/Hospital.java

@@ -3,6 +3,7 @@
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.util.HashSet;
@@ -13,6 +14,7 @@
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@EqualsAndHashCode(of = "id")
 public class Hospital {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -41,17 +43,4 @@ public static class SpecializationAvailability {
         private String name;
         private int bedsAvailable;
     }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        Hospital hospital = (Hospital) o;
-        return Objects.equals(id, hospital.id);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(id);
-    }
 }

backend/hospital-service/src/main/java/com/swyth/hospitalservice/entity/HospitalBedAvailability.java

@@ -3,13 +3,15 @@
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 @Entity
 @Table(name = "hospital_bed_availability")
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@EqualsAndHashCode(of = {"id"})
 public class HospitalBedAvailability {
 
     @EmbeddedId

backend/hospital-service/src/main/java/com/swyth/hospitalservice/entity/MedicalSpecialization.java

@@ -1,10 +1,7 @@
 package com.swyth.hospitalservice.entity;
 
 import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
 
 import java.util.HashSet;
 import java.util.Set;

backend/hospital-service/src/main/resources/application.yaml

@@ -25,7 +25,7 @@ spring:
     config:
       discovery:
         enabled: true
-      enabled: false # Switch to false if you add config server
+      enabled: false # Switch to true if you add config server
   datasource:
     url: jdbc:postgresql://localhost:5432/postgres
     username: postgres

frontend/realtime-emergency-app/src/app/components/booking-information/booking-information.component.html

@@ -71,8 +71,7 @@
         <!-- Action Buttons -->
         <div class="actions">
           <mat-card-actions>
-            <button mat-raised-button color="primary" [disabled]="bookingForm.invalid || isLoading"
-                    (click)="onReserveBed()">
+            <button mat-raised-button color="primary" type="submit" [disabled]="bookingForm.invalid || isLoading">
               Confirm Reservation
             </button>
           </mat-card-actions>