notfications fix

Signed-off-by: Dhruv Jain <92215138+jaydee029@users.noreply.github.com>

Author: jaydee029

api/handler/notifications.go

@@ -151,14 +151,15 @@ func (cfg *Handler) ReadNotification(w http.ResponseWriter, r *http.Request) {
 	var userid pgtype.UUID
 	err := userid.Scan(useridstr)
 	if err != nil {
+		cfg.logger.Info("Error setting UUID:", zap.Error(err))
 		respondWithError(w, http.StatusInternalServerError, err.Error())
 		return
 	}
 
 	var notificationid pgtype.UUID
 	err = notificationid.Scan(useridstr)
 	if err != nil {
-		cfg.logger.Info("Error setting UUID:", zap.Error(err))
+		cfg.logger.Info("Error setting notification ID:", zap.Error(err))
 		respondWithError(w, http.StatusInternalServerError, err.Error())
 		return
 	}
@@ -169,10 +170,11 @@ func (cfg *Handler) ReadNotification(w http.ResponseWriter, r *http.Request) {
 	})
 
 	if err != nil {
+		cfg.logger.Info("error while reading notification", zap.Error(err))
 		respondWithError(w, http.StatusInternalServerError, err.Error())
 	}
 
-	respondWithJson(w, http.StatusNoContent, "Notification Read")
+	respondWithJson(w, http.StatusOK, "Notification Read")
 }
 
 func (cfg *Handler) ReadNotifications(w http.ResponseWriter, r *http.Request) {

internal/database/notification.sql.go

@@ -5,7 +5,7 @@ ORDER BY generated_at DESC
 LIMIT $3;
 
 -- name: ReadNotificationSingle :exec
-UPDATE notifications SET read= true WHERE user_id=$1 AND id=$2;
+UPDATE notifications SET read=true WHERE user_id=$1 AND id=$2;
 
 
 -- name: ReadNotificationAll :exec
@@ -28,6 +28,6 @@ AND generated_at=$2
 WHERE id=$3 RETURNING actors;
 
 -- name: InsertCommentNotification :one
-INSERT INTO notifications(id, user_id,actors,type,prose_id,generated_at ) VALUES($1,$2,$3, 'comment',$4,$5) ON CONFLICT (user_id,prose_id,actors,type,read) 
+INSERT INTO notifications(id, user_id,actors,type,prose_id,generated_at ) VALUES($1,$2,$3, 'comment',$4,$5) ON CONFLICT (user_id,prose_id,type,read) 
 DO UPDATE SET actors= notifications.actors || $3, generated_at=$5
 RETURNING id,generated_at,actors;

sql/queries/notification.sql

@@ -2,10 +2,10 @@
 CREATE TABLE notifications(
     id uuid PRIMARY KEY,
     user_id uuid NOT NULL,
-    prose_id uuid UNIQUE,
+    prose_id uuid NOT NULL,
     actors VARCHAR [] ,
     generated_at TIMESTAMP NOT NULL,
-    type VARCHAR(12) NOT NULL,
+    type VARCHAR(15) NOT NULL,
     read BOOLEAN NOT NULL DEFAULT false
 );
 

sql/schema/010_notifications.sql

@@ -0,0 +1,5 @@
+-- +goose Up
+ALTER TABLE notifications ADD CONSTRAINT unique_comment_notification UNIQUE (user_id, prose_id, type, read);
+
+-- +goose Down
+ALTER TABLE notifications DROP CONSTRAINT unique_comment_notification;