fix: resolve submission retrieval issues and add admin comment functionality

- Add case-insensitive username matching in get_user_submissions handler
- Allow task resubmissions when not verified
- Ensure both 'user' and 'username' fields are populated
- Add comprehensive debug logging

Author: RashiJyotishi

database/connect.go

@@ -1,7 +1,7 @@
 package database
 
 import (
-	"CA_Backend/config"
+	"CA_Portal_backend/config"
 	"context"
 	"fmt"
 	"go.mongodb.org/mongo-driver/mongo"

go.mod

@@ -1,4 +1,4 @@
-module CA_Backend
+module CA_Portal_backend
 
 go 1.22.2
 

handler/leaderboard.go

@@ -1,7 +1,7 @@
 package handler
 
 import (
-	"CA_Backend/database"
+	"CA_Portal_backend/database"
 	"context"
 	"github.com/gofiber/fiber/v2"
 	"go.mongodb.org/mongo-driver/bson"

handler/tasks/add_admin_comment.go

@@ -0,0 +1,91 @@
+package tasks
+
+import (
+	"CA_Portal_backend/database"
+	"CA_Portal_backend/models"
+	"context"
+
+	// "time"
+
+	"github.com/gofiber/fiber/v2"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/bson/primitive"
+)
+
+// POST /api/submissions/comment/:submission_id
+func AddAdminComment(c *fiber.Ctx) error {
+	ctx := context.Background()
+
+	// Get submission ID from params
+	submissionID := c.Params("submission_id")
+	objectID, err := primitive.ObjectIDFromHex(submissionID)
+	if err != nil {
+		return c.Status(400).JSON(fiber.Map{
+			"message": "Invalid submission ID",
+		})
+	}
+
+	// Parse request body
+	var req struct {
+		Comment string `json:"comment" binding:"required"`
+	}
+
+	if err := c.BodyParser(&req); err != nil {
+		return c.Status(400).JSON(fiber.Map{
+			"error":   err.Error(),
+			"message": "Failed to parse JSON body",
+		})
+	}
+
+	if req.Comment == "" {
+		return c.Status(400).JSON(fiber.Map{
+			"message": "Comment cannot be empty",
+		})
+	}
+
+	// Connect to database
+	db, err := database.Connect()
+	if err != nil {
+		return c.Status(500).JSON(fiber.Map{
+			"message": "Database connection error: " + err.Error(),
+		})
+	}
+
+	collection := db.Collection("task_submissions")
+
+	// Check if submission exists
+	var submission models.TaskSubmission
+	err = collection.FindOne(ctx, bson.M{"_id": objectID}).Decode(&submission)
+	if err != nil {
+		return c.Status(404).JSON(fiber.Map{
+			"message": "Submission not found",
+		})
+	}
+
+	// Update submission with new comment
+	update := bson.M{
+		"$set": bson.M{
+			"admin_comment": req.Comment,
+			"verified":      false, // Reset verification when admin comments
+		},
+	}
+
+	result, err := collection.UpdateOne(ctx, bson.M{"_id": objectID}, update)
+	if err != nil {
+		return c.Status(500).JSON(fiber.Map{
+			"message": "Failed to add comment: " + err.Error(),
+		})
+	}
+
+	if result.MatchedCount == 0 {
+		return c.Status(404).JSON(fiber.Map{
+			"message": "Submission not found",
+		})
+	}
+
+	return c.Status(200).JSON(fiber.Map{
+		"message":       "Comment added successfully",
+		"submission_id": submissionID,
+		"comment":       req.Comment,
+	})
+}

handler/tasks/create_task.go

@@ -1,11 +1,12 @@
 package tasks
 
 import (
-	"CA_Backend/database"
-	"CA_Backend/models"
+	"CA_Portal_backend/database"
+	"CA_Portal_backend/models"
 	"context"
-	"github.com/gofiber/fiber/v2"
 	"time"
+
+	"github.com/gofiber/fiber/v2"
 )
 
 func CreateTask(c *fiber.Ctx) error {

handler/tasks/delete_task.go

@@ -1,7 +1,7 @@
 package tasks
 
 import (
-	"CA_Backend/database"
+	"CA_Portal_backend/database"
 	"context"
 
 	"github.com/gofiber/fiber/v2"

handler/tasks/get_all_submissions.go

@@ -1,8 +1,8 @@
 package tasks
 
 import (
-	"CA_Backend/database"
-	"CA_Backend/models"
+	"CA_Portal_backend/database"
+	"CA_Portal_backend/models"
 	"context"
 	"log"
 

handler/tasks/get_all_tasks.go

@@ -1,8 +1,8 @@
 package tasks
 
 import (
-	"CA_Backend/database"
-	"CA_Backend/models"
+	"CA_Portal_backend/database"
+	"CA_Portal_backend/models"
 	"context"
 	"log"
 

handler/tasks/get_task.go

@@ -1,8 +1,8 @@
 package tasks
 
 import (
-	"CA_Backend/database"
-	"CA_Backend/models"
+	"CA_Portal_backend/database"
+	"CA_Portal_backend/models"
 	"context"
 	"log"
 

handler/tasks/get_user_submissions.go

@@ -1,40 +1,62 @@
 package tasks
 
 import (
-	"CA_Backend/database"
-	"CA_Backend/models"
-	"CA_Backend/utils"
+	"CA_Portal_backend/database"
+	"CA_Portal_backend/models"
+	"CA_Portal_backend/utils"
 	"context"
 	"log"
+	"strings"
 
 	"github.com/gofiber/fiber/v2"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
 func GetUserSubmissions(c *fiber.Ctx) error {
+	log.Printf("=== GET USER SUBMISSIONS REQUEST ===")
+
 	ctx := context.Background()
 	db, err := database.Connect()
 	if err != nil {
-		log.Fatal(err.Error())
+		log.Printf("ERROR: Database connection failed: %v", err)
 		return c.Status(500).JSON(fiber.Map{
 			"error":   err.Error(),
 			"message": "Database connection error",
 		})
 	}
+	log.Printf("✓ Database connected: %s", db.Name())
 
 	tokenString := c.Get("Authorization")
+	log.Printf("Authorization header: %s", tokenString[:50]+"...") // Log first 50 chars
+
 	if len(tokenString) < 8 || tokenString[:7] != "Bearer " {
+		log.Printf("ERROR: Invalid authorization header format")
 		return c.Status(400).JSON(fiber.Map{"message": "Authorization header missing or improperly formatted"})
 	}
 	token := tokenString[7:]
 
-	username, _ := utils.DeserialiseUser(token)
+	username, err := utils.DeserialiseUser(token)
+	if err != nil {
+		log.Printf("ERROR: Failed to deserialize token: %v", err)
+		return c.Status(401).JSON(fiber.Map{"message": "Invalid token"})
+	}
+
+	log.Printf("Username from token: '%s'", username)
+
+	// Convert to lowercase for consistent querying
+	usernameLower := strings.ToLower(username)
+	log.Printf("Username (lowercase): '%s'", usernameLower)
 
 	var user_submissions []models.TaskSubmission
 
-	cursor, err := db.Collection("task_submissions").Find(ctx, bson.D{{Key: "User", Value: username}}, options.Find())
+	// Query using lowercase username
+	query := bson.M{"user": usernameLower}
+	log.Printf("MongoDB query: %+v", query)
+
+	cursor, err := db.Collection("task_submissions").Find(ctx, query, options.Find())
 	if err != nil {
+		log.Printf("ERROR: Database query failed: %v", err)
 		return c.Status(500).JSON(fiber.Map{
 			"error":   err.Error(),
 			"message": "Failed to fetch submissions",
@@ -43,11 +65,35 @@ func GetUserSubmissions(c *fiber.Ctx) error {
 	defer cursor.Close(ctx)
 
 	if err := cursor.All(ctx, &user_submissions); err != nil {
+		log.Printf("ERROR: Failed to decode results: %v", err)
 		return c.Status(500).JSON(fiber.Map{
 			"error":   err.Error(),
 			"message": "Error decoding submissions",
 		})
 	}
 
+	log.Printf("Query result: Found %d submissions", len(user_submissions))
+
+	if len(user_submissions) > 0 {
+		for i, sub := range user_submissions {
+			log.Printf("  [%d] ID: %s, Task: %s, User: %s, Username: %s, AdminComment: '%s'",
+				i+1, sub.ID.Hex(), sub.Task, sub.User, sub.Username, sub.AdminComment)
+		}
+	} else {
+		log.Printf("  ⚠️  No submissions found for user: %s", usernameLower)
+
+		// Debug: Check if any submissions exist
+		count, _ := db.Collection("task_submissions").CountDocuments(ctx, bson.M{})
+		log.Printf("  Total submissions in collection: %d", count)
+	}
+
+	// Return empty array instead of nil
+	if user_submissions == nil {
+		user_submissions = []models.TaskSubmission{}
+	}
+
+	log.Printf("Returning JSON with %d submissions", len(user_submissions))
+	log.Printf("===================================\n")
+
 	return c.Status(200).JSON(user_submissions)
-}
+}