Merge branch 'development' of https://gitlab.com/mbugroup/lti-api into feat/BE/sso-adjustment

internal/modules/expenses/services/expense.service.go

@@ -411,6 +411,10 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 		updateBody["supplier_id"] = *req.SupplierID
 	}
 
+	if req.Notes != nil {
+		updateBody["notes"] = *req.Notes
+	}
+
 	if req.LocationID != nil {
 		locationID := uint(*req.LocationID)
 		updateBody["location_id"] = locationID
@@ -583,20 +587,28 @@ func (s expenseService) UpdateOne(c *fiber.Ctx, req *validation.Update, id uint)
 		if err != nil {
 			return fiber.NewError(fiber.StatusUnauthorized, "Failed to get actor ID from context")
 		}
-		if *latestApproval.Action != entity.ApprovalActionUpdated {
+
+		if *latestApproval.Action != entity.ApprovalActionUpdated && latestApproval.StepNumber > uint16(utils.ExpenseStepPengajuan) {
 
 			approvalAction := entity.ApprovalActionUpdated
 
+			previousStep := approvalutils.ApprovalStep(latestApproval.StepNumber) - 1
+
+			if previousStep < utils.ExpenseStepPengajuan {
+				previousStep = utils.ExpenseStepPengajuan
+			}
+
 			if _, err := approvalSvcTx.CreateApproval(
 				c.Context(),
 				utils.ApprovalWorkflowExpense,
 				id,
-				utils.ExpenseStepPengajuan,
+				previousStep,
 				&approvalAction,
 				actorID,
 				nil); err != nil {
 				return fiber.NewError(fiber.StatusInternalServerError, "Failed to reset approval step")
 			}
+
 		}
 
 		if s.DocumentSvc != nil && len(req.Documents) > 0 {