chore(git): resolve merge conflicts with main

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/controller/CommunityQuestionController.java

@@ -0,0 +1,97 @@
+package com.rit.portal.controller;
+
+import com.rit.portal.entity.CommunityAnswer;
+import com.rit.portal.entity.CommunityQuestion;
+import com.rit.portal.repository.CommunityAnswerRepository;
+import com.rit.portal.repository.CommunityQuestionRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api/questions")
+public class CommunityQuestionController {
+
+    @Autowired
+    private CommunityQuestionRepository questionRepository;
+
+    @Autowired
+    private CommunityAnswerRepository answerRepository;
+
+    private final RestTemplate restTemplate = new RestTemplate();
+    private static final String TELEGRAM_BOT_URL = "http://localhost:8082/send_question";
+
+    @GetMapping
+    public List<CommunityQuestion> getAllQuestions() {
+        return questionRepository.findAll();
+    }
+
+    @GetMapping("/paged")
+    public org.springframework.data.domain.Page<CommunityQuestion> getPagedQuestions(
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "5") int size) {
+        return questionRepository.findAll(
+            org.springframework.data.domain.PageRequest.of(
+                page,
+                size,
+                org.springframework.data.domain.Sort.by("createdAt").descending()
+            )
+        );
+    }
+
+    @PostMapping
+    public CommunityQuestion createQuestion(@RequestBody CommunityQuestion question) {
+        if (question.getUpvotes() == null) question.setUpvotes(0);
+        if (question.getIsAnswered() == null) question.setIsAnswered(false);
+        question.setCreatedAt(LocalDateTime.now());
+        
+        CommunityQuestion saved = questionRepository.save(question);
+        
+        // Notify Telegram bot in a background thread to keep it robust and non-blocking
+        new Thread(() -> {
+            try {
+                Map<String, Object> payload = new HashMap<>();
+                payload.put("question_id", saved.getId());
+                payload.put("title", saved.getTitle());
+                payload.put("body", saved.getBody());
+                payload.put("author", saved.getAuthor());
+                
+                restTemplate.postForEntity(TELEGRAM_BOT_URL, payload, String.class);
+            } catch (Exception e) {
+                System.err.println("Failed to notify Telegram Bot intermediary: " + e.getMessage());
+            }
+        }).start();
+
+        return saved;
+    }
+
+    @PostMapping("/{id}/answers")
+    public ResponseEntity<CommunityAnswer> addAnswer(@PathVariable Integer id, @RequestBody CommunityAnswer answer) {
+        return questionRepository.findById(id).map(question -> {
+            answer.setQuestion(question);
+            if (answer.getUpvotes() == null) answer.setUpvotes(0);
+            if (answer.getIsAccepted() == null) answer.setIsAccepted(false);
+            answer.setCreatedAt(LocalDateTime.now());
+            
+            CommunityAnswer savedAnswer = answerRepository.save(answer);
+            
+            question.setIsAnswered(true);
+            questionRepository.save(question);
+            
+            return ResponseEntity.ok(savedAnswer);
+        }).orElse(ResponseEntity.notFound().build());
+    }
+
+    @PostMapping("/{id}/upvote")
+    public ResponseEntity<CommunityQuestion> upvoteQuestion(@PathVariable Integer id) {
+        return questionRepository.findById(id).map(question -> {
+            question.setUpvotes(question.getUpvotes() + 1);
+            return ResponseEntity.ok(questionRepository.save(question));
+        }).orElse(ResponseEntity.notFound().build());
+    }
+}

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

@@ -14,7 +14,6 @@ import java.time.LocalDateTime;
 
 @RestController
 @RequestMapping("/api/notes")
-@CrossOrigin(origins = "*") // CrossOrigin configured globally, but added here for safety
 public class NotePyqController {
 
     @Autowired
@@ -142,7 +141,7 @@ public class NotePyqController {
 
     // Increment downloads count
     @PostMapping("/{id}/download")
-    public ResponseEntity<Void> incrementDownloads(@PathVariable Long id) {
+    public ResponseEntity<Void> incrementDownloads(@PathVariable Integer id) {
         return noteRepository.findById(id).map(note -> {
             note.setDownloadsCount(note.getDownloadsCount() + 1);
             note.setFileType(note.getFileType()); // Keep dirty check

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/entity/CommunityAnswer.java

@@ -0,0 +1,40 @@
+package com.rit.portal.entity;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.persistence.*;
+import lombok.*;
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "community_answers")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class CommunityAnswer {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "question_id", nullable = false)
+    @JsonIgnore
+    private CommunityQuestion question;
+
+    @Column(nullable = false, columnDefinition = "TEXT")
+    private String body;
+
+    @Column(nullable = false)
+    private String author;
+
+    @Column(name = "upvotes")
+    private Integer upvotes = 0;
+
+    @Column(name = "is_accepted")
+    private Boolean isAccepted = false;
+
+    @Column(name = "created_at")
+    private LocalDateTime createdAt = LocalDateTime.now();
+}

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

@@ -0,0 +1,46 @@
+package com.rit.portal.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "community_questions")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class CommunityQuestion {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(nullable = false)
+    private String title;
+
+    @Column(nullable = false, columnDefinition = "TEXT")
+    private String body;
+
+    @Column(nullable = false)
+    private String author;
+
+    @Column(name = "upvotes")
+    private Integer upvotes = 0;
+
+    @Column(name = "tags", columnDefinition = "text[]")
+    private List<String> tags = new ArrayList<>();
+
+    @Column(name = "is_answered")
+    private Boolean isAnswered = false;
+
+    @Column(name = "created_at")
+    private LocalDateTime createdAt = LocalDateTime.now();
+
+    @OneToMany(mappedBy = "question", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @Builder.Default
+    private List<CommunityAnswer> answers = new ArrayList<>();
+}

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

@@ -15,7 +15,7 @@ public class NotePyq {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private Integer id;
 
     @Column(nullable = false)
     private String title;

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> {
+}

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

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

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

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

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

@@ -6,7 +6,7 @@ import org.springframework.stereotype.Repository;
 import java.util.List;
 
 @Repository
-public interface NotePyqRepository extends JpaRepository<NotePyq, Long> {
+public interface NotePyqRepository extends JpaRepository<NotePyq, Integer> {
     List<NotePyq> findBySemester(Integer semester);
     List<NotePyq> findByDepartment(String department);
     List<NotePyq> findByFileType(String fileType);

backend/src/main/resources/application.properties

@@ -1,7 +1,7 @@
 # ─── DATABASE CONNECTION CONFIGURATION ───
 spring.datasource.url=jdbc:postgresql://localhost:5432/rit_freshers_hub?sslmode=disable
 spring.datasource.username=postgres
-spring.datasource.password=Amudiesh22@.
+spring.datasource.password=${DB_PASSWORD:murugan06}
 
 # ─── JPA / HIBERNATE SETTINGS ───
 spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect