Merge branch 'main' into feature/freshers-qa

backend/src/main/java/com/rit/portal/config/DataInitializer.java

@@ -1,12 +1,21 @@
 package com.rit.portal.config;
 
 import com.rit.portal.entity.NotePyq;
+import com.rit.portal.entity.BusRoute;
+import com.rit.portal.entity.BusStop;
 import com.rit.portal.repository.NotePyqRepository;
+import com.rit.portal.repository.BusRouteRepository;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
+import java.io.InputStream;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 @Component
 public class DataInitializer implements CommandLineRunner {
@@ -14,6 +23,9 @@ public class DataInitializer implements CommandLineRunner {
     @Autowired
     private NotePyqRepository noteRepository;
 
+    @Autowired
+    private BusRouteRepository busRouteRepository;
+
     @Override
     public void run(String... args) throws Exception {
         if (noteRepository.count() == 0) {
@@ -109,5 +121,52 @@ public class DataInitializer implements CommandLineRunner {
             ));
             System.out.println("🌱 Database successfully seeded with Notes & PYQs test data!");
         }
+
+        // Seed Bus Routes
+        if (busRouteRepository.count() == 0) {
+            try {
+                ObjectMapper mapper = new ObjectMapper();
+                InputStream is = getClass().getResourceAsStream("/bus_routes.json");
+                if (is != null) {
+                    List<Map<String, Object>> routesList = mapper.readValue(is, new TypeReference<List<Map<String, Object>>>() {});
+                    List<BusRoute> routesToSave = new ArrayList<>();
+                    
+                    for (Map<String, Object> routeMap : routesList) {
+                        BusRoute br = BusRoute.builder()
+                            .number((String) routeMap.get("number"))
+                            .name((String) routeMap.get("name"))
+                            .from((String) routeMap.get("from"))
+                            .to((String) routeMap.get("to"))
+                            .departureTime((String) routeMap.get("departureTime"))
+                            .arrivalTime((String) routeMap.get("arrivalTime"))
+                            .color((String) routeMap.get("color"))
+                            .build();
+                        
+                        List<Map<String, String>> stopsList = (List<Map<String, String>>) routeMap.get("stops");
+                        List<BusStop> stops = new ArrayList<>();
+                        if (stopsList != null) {
+                            for (int i = 0; i < stopsList.size(); i++) {
+                                Map<String, String> stopMap = stopsList.get(i);
+                                stops.add(BusStop.builder()
+                                    .route(br)
+                                    .name(stopMap.get("name"))
+                                    .time(stopMap.get("time"))
+                                    .stopOrder(i + 1)
+                                    .build());
+                            }
+                        }
+                        br.setStops(stops);
+                        routesToSave.add(br);
+                    }
+                    busRouteRepository.saveAll(routesToSave);
+                    System.out.println("🌱 Database successfully seeded with " + routesToSave.size() + " Bus Routes and stops!");
+                } else {
+                    System.err.println("⚠️ Could not find bus_routes.json in resources!");
+                }
+            } catch (Exception e) {
+                System.err.println("❌ Failed to seed bus routes: " + e.getMessage());
+                e.printStackTrace();
+            }
+        }
     }
 }

backend/src/main/java/com/rit/portal/controller/BusRouteController.java

@@ -0,0 +1,20 @@
+package com.rit.portal.controller;
+
+import com.rit.portal.entity.BusRoute;
+import com.rit.portal.repository.BusRouteRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/bus-routes")
+public class BusRouteController {
+
+    @Autowired
+    private BusRouteRepository busRouteRepository;
+
+    @GetMapping
+    public List<BusRoute> getAllBusRoutes() {
+        return busRouteRepository.findAll();
+    }
+}

backend/src/main/java/com/rit/portal/entity/BusRoute.java

@@ -0,0 +1,46 @@
+package com.rit.portal.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "bus_routes")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class BusRoute {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(name = "route_number", unique = true, nullable = false)
+    private String number;
+
+    @Column(name = "route_name", nullable = false)
+    private String name;
+
+    @Column(name = "start_point", nullable = false)
+    private String from;
+
+    @Column(name = "end_point", nullable = false)
+    private String to;
+
+    @Column(name = "departure_time", nullable = false)
+    private String departureTime;
+
+    @Column(name = "arrival_time", nullable = false)
+    private String arrivalTime;
+
+    @Column(name = "color_code")
+    private String color;
+
+    @OneToMany(mappedBy = "route", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @OrderBy("stopOrder ASC")
+    @Builder.Default
+    private List<BusStop> stops = new ArrayList<>();
+}

backend/src/main/java/com/rit/portal/entity/BusStop.java

@@ -0,0 +1,33 @@
+package com.rit.portal.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@Table(name = "bus_stops")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class BusStop {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "route_id", nullable = false)
+    @JsonIgnore
+    private BusRoute route;
+
+    @Column(name = "stop_name", nullable = false)
+    private String name;
+
+    @Column(name = "arrival_time", nullable = false)
+    private String time;
+
+    @Column(name = "stop_order", nullable = false)
+    private Integer stopOrder;
+}

backend/src/main/java/com/rit/portal/repository/BusRouteRepository.java

@@ -0,0 +1,10 @@
+package com.rit.portal.repository;
+
+import com.rit.portal.entity.BusRoute;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface BusRouteRepository extends JpaRepository<BusRoute, Integer> {
+    BusRoute findByNumber(String number);
+}

backend/src/main/java/com/rit/portal/repository/BusStopRepository.java

@@ -0,0 +1,9 @@
+package com.rit.portal.repository;
+
+import com.rit.portal.entity.BusStop;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface BusStopRepository extends JpaRepository<BusStop, Integer> {
+}