Fix

2025-08-19 16:11:32 +07:00
parent f41daa63da
commit 7d5f061a1b
6 changed files with 294 additions and 217 deletions
@@ -35,13 +35,11 @@ func (h *AdminApprovalFlowHandler) CreateApprovalFlow(c *gin.Context) {
 		return
 	}

-	// Validate that at least one step is provided
 	if len(req.Steps) == 0 {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "at least one approval step is required", Code: http.StatusBadRequest})
 		return
 	}

-	// Validate each step has either a role or user as approver
 	for i, step := range req.Steps {
 		if step.ApproverRoleID == nil && step.ApproverUserID == nil {
 			c.JSON(http.StatusBadRequest, &contract.ErrorResponse{
@@ -113,13 +111,11 @@ func (h *AdminApprovalFlowHandler) UpdateApprovalFlow(c *gin.Context) {
 		return
 	}

-	// Validate that at least one step is provided
 	if len(req.Steps) == 0 {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "at least one approval step is required", Code: http.StatusBadRequest})
 		return
 	}

-	// Validate each step has either a role or user as approver
 	for i, step := range req.Steps {
 		if step.ApproverRoleID == nil && step.ApproverUserID == nil {
 			c.JSON(http.StatusBadRequest, &contract.ErrorResponse{
@@ -341,4 +337,4 @@ func (h *AdminApprovalFlowHandler) CloneApprovalFlow(c *gin.Context) {
 	}

 	c.JSON(http.StatusCreated, contract.BuildSuccessResponse(resp))
-}
+}
@@ -2,6 +2,7 @@ package handler

 import (
 	"context"
+	"eslogad-be/internal/appcontext"
 	"net/http"
 	"strconv"

@@ -17,20 +18,20 @@ type LetterOutgoingService interface {
 	ListOutgoingLetters(ctx context.Context, req *contract.ListOutgoingLettersRequest) (*contract.ListOutgoingLettersResponse, error)
 	UpdateOutgoingLetter(ctx context.Context, id uuid.UUID, req *contract.UpdateOutgoingLetterRequest) (*contract.OutgoingLetterResponse, error)
 	DeleteOutgoingLetter(ctx context.Context, id uuid.UUID) error
-	
+
 	SubmitForApproval(ctx context.Context, letterID uuid.UUID) error
 	ApproveOutgoingLetter(ctx context.Context, letterID uuid.UUID, req *contract.ApproveLetterRequest) error
 	RejectOutgoingLetter(ctx context.Context, letterID uuid.UUID, req *contract.RejectLetterRequest) error
 	SendOutgoingLetter(ctx context.Context, letterID uuid.UUID) error
 	ArchiveOutgoingLetter(ctx context.Context, letterID uuid.UUID) error
-	
+
 	AddRecipients(ctx context.Context, letterID uuid.UUID, req *contract.AddRecipientsRequest) error
 	UpdateRecipient(ctx context.Context, letterID uuid.UUID, recipientID uuid.UUID, req *contract.UpdateRecipientRequest) error
 	RemoveRecipient(ctx context.Context, letterID uuid.UUID, recipientID uuid.UUID) error
-	
+
 	AddAttachments(ctx context.Context, letterID uuid.UUID, req *contract.AddAttachmentsRequest) error
 	RemoveAttachment(ctx context.Context, letterID uuid.UUID, attachmentID uuid.UUID) error
-	
+
 	CreateDiscussion(ctx context.Context, letterID uuid.UUID, req *contract.CreateDiscussionRequest) (*contract.DiscussionResponse, error)
 	UpdateDiscussion(ctx context.Context, discussionID uuid.UUID, req *contract.UpdateDiscussionRequest) error
 	DeleteDiscussion(ctx context.Context, discussionID uuid.UUID) error
@@ -50,13 +51,15 @@ func (h *LetterOutgoingHandler) CreateOutgoingLetter(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid body", Code: http.StatusBadRequest})
 		return
 	}
-	
+	ctx := c.Request.Context()
+	req.UserID = appcontext.FromGinContext(ctx).UserID
+
 	resp, err := h.svc.CreateOutgoingLetter(c.Request.Context(), &req)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusCreated, contract.BuildSuccessResponse(resp))
 }

@@ -66,13 +69,13 @@ func (h *LetterOutgoingHandler) GetOutgoingLetter(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	resp, err := h.svc.GetOutgoingLetterByID(c.Request.Context(), id)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, contract.BuildSuccessResponse(resp))
 }

@@ -80,17 +83,17 @@ func (h *LetterOutgoingHandler) ListOutgoingLetters(c *gin.Context) {
 	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
 	limit, _ := strconv.Atoi(c.DefaultQuery("limit", "10"))
 	offset := (page - 1) * limit
-	
+
 	status := c.Query("status")
 	query := c.Query("q")
 	createdByStr := c.Query("created_by")
 	receiverInstitutionStr := c.Query("receiver_institution_id")
-	
+
 	var statusPtr *string
 	var queryPtr *string
 	var createdByPtr *uuid.UUID
 	var receiverInstitutionPtr *uuid.UUID
-	
+
 	if status != "" {
 		statusPtr = &status
 	}
@@ -107,7 +110,7 @@ func (h *LetterOutgoingHandler) ListOutgoingLetters(c *gin.Context) {
 			receiverInstitutionPtr = &receiverInstitution
 		}
 	}
-	
+
 	req := &contract.ListOutgoingLettersRequest{
 		Limit:                 limit,
 		Offset:                offset,
@@ -116,13 +119,13 @@ func (h *LetterOutgoingHandler) ListOutgoingLetters(c *gin.Context) {
 		CreatedBy:             createdByPtr,
 		ReceiverInstitutionID: receiverInstitutionPtr,
 	}
-	
+
 	resp, err := h.svc.ListOutgoingLetters(c.Request.Context(), req)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, contract.BuildSuccessResponse(resp))
 }

@@ -132,19 +135,19 @@ func (h *LetterOutgoingHandler) UpdateOutgoingLetter(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	var req contract.UpdateOutgoingLetterRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid body", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	resp, err := h.svc.UpdateOutgoingLetter(c.Request.Context(), id, &req)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, contract.BuildSuccessResponse(resp))
 }

@@ -154,12 +157,12 @@ func (h *LetterOutgoingHandler) DeleteOutgoingLetter(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	if err := h.svc.DeleteOutgoingLetter(c.Request.Context(), id); err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, &contract.SuccessResponse{Message: "deleted"})
 }

@@ -169,12 +172,12 @@ func (h *LetterOutgoingHandler) SubmitForApproval(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	if err := h.svc.SubmitForApproval(c.Request.Context(), id); err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, &contract.SuccessResponse{Message: "submitted for approval"})
 }

@@ -184,18 +187,18 @@ func (h *LetterOutgoingHandler) ApproveOutgoingLetter(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	var req contract.ApproveLetterRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid body", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	if err := h.svc.ApproveOutgoingLetter(c.Request.Context(), id, &req); err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, &contract.SuccessResponse{Message: "approved"})
 }

@@ -205,18 +208,18 @@ func (h *LetterOutgoingHandler) RejectOutgoingLetter(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	var req contract.RejectLetterRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid body", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	if err := h.svc.RejectOutgoingLetter(c.Request.Context(), id, &req); err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, &contract.SuccessResponse{Message: "rejected"})
 }

@@ -226,12 +229,12 @@ func (h *LetterOutgoingHandler) SendOutgoingLetter(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	if err := h.svc.SendOutgoingLetter(c.Request.Context(), id); err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, &contract.SuccessResponse{Message: "sent"})
 }

@@ -241,12 +244,12 @@ func (h *LetterOutgoingHandler) ArchiveOutgoingLetter(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	if err := h.svc.ArchiveOutgoingLetter(c.Request.Context(), id); err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, &contract.SuccessResponse{Message: "archived"})
 }

@@ -256,18 +259,18 @@ func (h *LetterOutgoingHandler) AddRecipients(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	var req contract.AddRecipientsRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid body", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	if err := h.svc.AddRecipients(c.Request.Context(), id, &req); err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, &contract.SuccessResponse{Message: "recipients added"})
 }

@@ -277,24 +280,24 @@ func (h *LetterOutgoingHandler) UpdateRecipient(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid letter id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	recipientID, err := uuid.Parse(c.Param("recipient_id"))
 	if err != nil {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid recipient id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	var req contract.UpdateRecipientRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid body", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	if err := h.svc.UpdateRecipient(c.Request.Context(), id, recipientID, &req); err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, &contract.SuccessResponse{Message: "recipient updated"})
 }

@@ -304,18 +307,18 @@ func (h *LetterOutgoingHandler) RemoveRecipient(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid letter id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	recipientID, err := uuid.Parse(c.Param("recipient_id"))
 	if err != nil {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid recipient id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	if err := h.svc.RemoveRecipient(c.Request.Context(), id, recipientID); err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, &contract.SuccessResponse{Message: "recipient removed"})
 }

@@ -325,18 +328,18 @@ func (h *LetterOutgoingHandler) AddAttachments(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	var req contract.AddAttachmentsRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid body", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	if err := h.svc.AddAttachments(c.Request.Context(), id, &req); err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, &contract.SuccessResponse{Message: "attachments added"})
 }

@@ -346,18 +349,18 @@ func (h *LetterOutgoingHandler) RemoveAttachment(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid letter id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	attachmentID, err := uuid.Parse(c.Param("attachment_id"))
 	if err != nil {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid attachment id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	if err := h.svc.RemoveAttachment(c.Request.Context(), id, attachmentID); err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, &contract.SuccessResponse{Message: "attachment removed"})
 }

@@ -367,19 +370,19 @@ func (h *LetterOutgoingHandler) CreateDiscussion(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid letter id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	var req contract.CreateDiscussionRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid body", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	resp, err := h.svc.CreateDiscussion(c.Request.Context(), id, &req)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusCreated, contract.BuildSuccessResponse(resp))
 }

@@ -389,18 +392,18 @@ func (h *LetterOutgoingHandler) UpdateDiscussion(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid discussion id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	var req contract.UpdateDiscussionRequest
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid body", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	if err := h.svc.UpdateDiscussion(c.Request.Context(), discussionID, &req); err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, &contract.SuccessResponse{Message: "discussion updated"})
 }

@@ -410,11 +413,11 @@ func (h *LetterOutgoingHandler) DeleteDiscussion(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, &contract.ErrorResponse{Error: "invalid discussion id", Code: http.StatusBadRequest})
 		return
 	}
-	
+
 	if err := h.svc.DeleteDiscussion(c.Request.Context(), discussionID); err != nil {
 		c.JSON(http.StatusInternalServerError, &contract.ErrorResponse{Error: err.Error(), Code: http.StatusInternalServerError})
 		return
 	}
-	
+
 	c.JSON(http.StatusOK, &contract.SuccessResponse{Message: "discussion deleted"})
 }