Fix/number

README.md

@@ -0,0 +1,158 @@
+# 🌟 DivineSpark — Live Session Booking & Payments Platform
+
+DivineSpark is a **production-ready, client-facing web platform** for managing and booking live spiritual and wellness sessions.  
+The system is designed with real-world requirements such as **secure authentication, role-based access, installment payments, admin control, and operational automation**.
+
+---
+
+## 🚀 Key Features
+
+### 🔐 Authentication & Security
+- Email-based authentication with JWT
+- Role-based access control (USER / ADMIN)
+- Secured APIs using Spring Security
+- Controlled access to session join links based on payment eligibility
+
+---
+
+### 📅 Session Management
+- Admin can create, update, and delete sessions
+- Supports both **Free** and **Paid** sessions
+- Seat availability management
+- Users can view and book upcoming sessions
+
+---
+
+### 💳 Payments & Installments
+- Integrated Razorpay for secure online payments
+- Supports:
+  - One-time full payments
+  - Installment-based payments
+- Tracks:
+  - Paid amount
+  - Remaining amount
+  - Installment status per booking
+- Booking lifecycle states:
+  - `PENDING`
+  - `PARTIALLY_PAID`
+  - `CONFIRMED`
+  - `CANCELLED`
+
+---
+
+### 🔗 Controlled Session Access
+- Session join (WhatsApp) links are exposed only when eligibility is verified
+- Access allowed only for `CONFIRMED` or `PARTIALLY_PAID` users
+- Prevents unauthorized sharing or misuse of session links
+
+---
+
+### 🛠 Admin Features
+- View users registered for each session
+- Monitor installment payments per user
+- Approve or reject user reviews
+- Manage blogs, reviews, and events
+- Export user, booking, and payment data as CSV for reporting
+
+---
+
+### ⚙️ Automation & Maintenance
+- Designed to support scheduled CRON jobs
+- Periodic database cleanup and archival (e.g., every 3 months)
+- Helps reduce storage cost and maintain long-term performance
+
+---
+
+## 🧱 Tech Stack
+
+### Backend
+- Java 17
+- Spring Boot
+- Spring Security (JWT)
+- Spring Data JPA
+- MySQL
+- Razorpay Payment Gateway
+
+### Frontend
+- React
+- TypeScript
+- Axios
+- Mobile-friendly and responsive UI
+
+### Tools & Concepts
+- REST APIs
+- Webhooks for payment events
+- Cron jobs for automation
+- CSV export for admin reporting
+
+---
+
+## 🏗 Architecture Overview
+
+- Stateless backend with JWT-based authentication
+- Clear separation of layers:
+  - Controllers
+  - Services
+  - Repositories
+- Payment handling via:
+  - Frontend verification (primary)
+  - Webhook-based confirmation (fallback)
+- Booking records preserved as immutable financial history
+- Business rules enforced at the service layer
+
+---
+
+## 🔄 Booking & Payment Flow
+
+1. User browses available sessions
+2. Selects free or paid session
+3. For paid sessions:
+   - Chooses full payment or installment option
+4. Payment processed via Razorpay
+5. Booking status updated based on payment progress
+6. Session access granted only to eligible users
+
+---
+
+## 🧪 Testing & Validation
+
+- Manual testing of:
+  - Free session booking
+  - Full payment flow
+  - Installment payments
+  - Cancelled booking re-booking
+  - Admin workflows
+- Payment edge cases handled:
+  - Webhook retries
+  - Partial payments
+  - Duplicate payment prevention
+
+---
+
+## 📦 Project Status
+
+- Core features implemented
+- Backend is production-ready
+- Continuous enhancements in progress
+
+---
+
+## 📌 Planned Enhancements
+- Automated installment reminder notifications
+- Admin payment reconciliation dashboard
+- Advanced analytics and reporting
+- Full CRON-based archival pipeline
+- Cloud deployment with monitoring
+
+---
+
+## 👩‍💻 Project Context
+
+DivineSpark is a **client-facing production project**, built with a strong focus on real-world payment flows, secure access control, operational automation, and long-term maintainability.
+
+---
+
+## 📄 License
+
+This project is proprietary and developed for a client use case.  
+Reuse or redistribution requires prior permission.

divinespark-backend/src/main/java/com/divinespark/controller/user/PaymentVerificationController.java

@@ -19,9 +19,22 @@ public PaymentVerificationController(InstallementService installmentService) {
 
     @PostMapping("/installment/verify")
     public ResponseEntity<Void> verifyInstallment(
-            @RequestParam String razorpayOrderId
+            @RequestParam String razorpayOrderId,
+            @RequestParam String razorpayPaymentId,
+            @RequestParam String razorpaySignature
     ) {
-        installmentService.markInstallmentPaid(razorpayOrderId);
+        System.out.println(">>> VERIFY API HIT <<<");
+        System.out.println("orderId = " + razorpayOrderId);
+        System.out.println("paymentId = " + razorpayPaymentId);
+        System.out.println("signature = " + razorpaySignature);
+
+        installmentService.verifyAndMarkInstallmentPaid(
+                razorpayOrderId,
+                razorpayPaymentId,
+                razorpaySignature
+        );
+
         return ResponseEntity.ok().build();
     }
-}
+
+}

divinespark-backend/src/main/java/com/divinespark/controller/user/ReviewController.java

@@ -31,7 +31,6 @@ public ResponseEntity<Void> submitReview(
         return ResponseEntity.ok().build();
     }
 
-    @PreAuthorize("hasRole('USER')")
     @GetMapping
     public ResponseEntity<ReviewResponse> getMyReview(
             @AuthenticationPrincipal CustomUserDetails userDetails

divinespark-backend/src/main/java/com/divinespark/dto/BlogDetailResponse.java

@@ -10,6 +10,16 @@ public class BlogDetailResponse {
     private String authorRole;
     private OffsetDateTime createdAt;
 
+
+    private Boolean isPublished;
+
+    public Boolean getIsPublished() {
+        return isPublished;
+    }
+    public void setIsPublished(Boolean isPublished) {
+        this.isPublished = isPublished;
+    }
+
     public String getTitle() {
         return title;
     }
@@ -49,4 +59,4 @@ public OffsetDateTime getCreatedAt() {
     public void setCreatedAt(OffsetDateTime createdAt) {
         this.createdAt = createdAt;
     }
-}
+}

divinespark-backend/src/main/java/com/divinespark/dto/BlogListResponse.java

@@ -12,6 +12,16 @@ public class BlogListResponse {
     private Long id;
 
 
+    private Boolean isPublished;
+
+    public Boolean getIsPublished() {
+        return isPublished;
+    }
+    public void setIsPublished(Boolean isPublished) {
+        this.isPublished = isPublished;
+    }
+
+
     public String getAuthorName() {
         return authorName;
     }
@@ -68,4 +78,4 @@ public String getTitle() {
     public void setTitle(String title) {
         this.title = title;
     }
-}
+}

divinespark-backend/src/main/java/com/divinespark/dto/SessionCreateRequest.java

@@ -13,7 +13,7 @@ public class SessionCreateRequest {
     private double price;
     private String whatsappGroupLink;
 
-    // ✅ Frontend sends OffsetDateTime with +05:30
+    //  Frontend sends OffsetDateTime with +05:30
     private OffsetDateTime startTime;
     private OffsetDateTime endTime;
 

divinespark-backend/src/main/java/com/divinespark/entity/Booking.java

@@ -7,8 +7,7 @@
 import java.time.OffsetDateTime;
 
 @Entity
-@Table(name = "bookings",
-        uniqueConstraints = @UniqueConstraint(columnNames = {"user_id", "session_id"}))
+@Table(name = "bookings")
 public class Booking {
 
     @Id

divinespark-backend/src/main/java/com/divinespark/entity/Event.java

@@ -22,7 +22,7 @@ public class Event {
     @Column(nullable = false)
     private OffsetDateTime startTime;
 
-    @Column(nullable = false)
+    @Column
     private Integer durationMinutes;
     // auto-expiry logic uses this
 
@@ -81,4 +81,4 @@ public OffsetDateTime getCreatedAt() {
     public void setCreatedAt(OffsetDateTime createdAt) {
         this.createdAt = createdAt;
     }
-}
+}

divinespark-backend/src/main/java/com/divinespark/repository/BookingRepository.java

@@ -24,22 +24,18 @@ public interface BookingRepository extends JpaRepository<Booking, Long> {
     """)
     List<Booking> findUserBookingsWithSession(Long userId);
 
-    Optional<Booking> findByUser_IdAndSession_Id(
-            Long userId,
-            Long sessionId
-    );
+    Optional<Booking> findByUserIdAndSessionId(Long userId, Long sessionId);
 
-    boolean existsByUser_IdAndSession_Id(
-            Long userId,
-            Long sessionId
-    );
 
-    boolean existsByUser_IdAndSession_IdAndBookingStatus(
+    Optional<Booking> findFirstByUser_IdAndSession_IdAndBookingStatusInOrderByCreatedAtDesc(
             Long userId,
             Long sessionId,
-            BookingStatus bookingStatus
+            List<BookingStatus> statuses
     );
 
+
+
+
     // ---------- ADMIN ----------
     @Query("""
         SELECT new com.divinespark.dto.AdminSessionUserResponse(
@@ -101,5 +97,12 @@ List<Booking> findBookingEntitiesBySessionId(
             @Param("sessionId") Long sessionId
     );
 
+    boolean existsByUserIdAndSessionIdAndBookingStatusIn(
+            Long userId,
+            Long sessionId,
+            List<BookingStatus> statuses
+    );
+
+
 
-}
+}

divinespark-backend/src/main/java/com/divinespark/repository/InstallmentRepository.java

@@ -37,5 +37,9 @@ void updateOrderId(
             @Param("orderId") String orderId
     );
 
+    @Modifying
+    @Query("delete from Installment i where i.booking.id = :bookingId")
+    void deleteByBookingId(@Param("bookingId") Long bookingId);
+
 
-}
+}

divinespark-backend/src/main/java/com/divinespark/repository/PaymentRepository.java

@@ -10,7 +10,7 @@
 
 public interface PaymentRepository extends JpaRepository<Payment, Long> {
 
-    Payment findByGatewayOrderId(String gatewayOrderId);
+    Optional<Payment> findByGatewayOrderId(String gatewayOrderId);
 
     Optional<Payment> findTopByBookingIdOrderByCreatedAtDesc(Long bookingId);
 

divinespark-backend/src/main/java/com/divinespark/security/SecurityConfig.java

@@ -6,8 +6,6 @@
 import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.web.cors.CorsConfiguration;
@@ -55,18 +53,28 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                                 "/api/v1/user/review/**"
                         ).permitAll()
 
-                        // User APIs
-                        .requestMatchers("/api/v1/user/**", "/api/v1/installments/**, ", "/api/v1/payments").hasRole("USER")
+                        // PUBLIC: session browsing & reviews (NO LOGIN)
+                        .requestMatchers(
+                                HttpMethod.GET,
+                                "/api/v1/sessions/**",
+                                "/api/v1/user/review/**",
+                                "/api/v1/blogs/**"
+                        ).permitAll()
 
-                        // Public session browsing
-                        .requestMatchers(HttpMethod.GET, "/api/v1/sessions/**").permitAll()
+                        // User APIs (LOGIN REQUIRED)
+                        .requestMatchers(
+                                "/api/v1/user/**",
+                                "/api/v1/installments/**",
+                                "/api/v1/payments/**"
+                        ).hasRole("USER")
 
                         // Admin APIs
                         .requestMatchers("/api/v1/admin/**").hasRole("ADMIN")
 
                         .anyRequest().authenticated()
                 )
 
+
                 // THIS PREVENTS GOOGLE REDIRECTS
 //                .exceptionHandling(ex -> ex
 //                        .authenticationEntryPoint((request, response, authException) -> {
@@ -123,4 +131,4 @@ public CorsConfigurationSource corsConfigurationSource() {
 //    public PasswordEncoder passwordEncoder() {
 //        return new BCryptPasswordEncoder();
 //    }
-}
+}