Merge pull request #22 from RECYTHNG/develop

Develop
RECYTHNG · Jun 22, 2024 · 7ca5d5b · 7ca5d5b
2 parents 83e12cd + c48c020
commit 7ca5d5b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 20 deletions.
diff --git a/internal/task/approval_task/handler/approval_task_handler_impl.go b/internal/task/approval_task/handler/approval_task_handler_impl.go
@@ -38,7 +38,7 @@ func (handler *ApprovalTaskHandlerImpl) GetAllApprovalTaskPaginationHandler(c ec
 		return err
 	}
 
-	userTask, total, err := handler.usecase.GetAllApprovalTaskPaginationUseCase(limitInt, (pageInt-1)*limitInt)
+	userTask, total, err := handler.usecase.GetAllApprovalTaskPaginationUseCase(limitInt, pageInt)
 	if err != nil {
 		return helper.ErrorHandler(c, http.StatusInternalServerError, "internal server error, detail : "+err.Error())
 	}
@@ -76,7 +76,7 @@ func (handler *ApprovalTaskHandlerImpl) GetAllApprovalTaskPaginationHandler(c ec
 		TotalData: total,
 		TotalPage: totalPage,
 	}
-	responseData := helper.ResponseData(http.StatusOK, "success get all task", responseDataPagination)
+	responseData := helper.ResponseData(http.StatusOK, "success get all user task", responseDataPagination)
 
 	return c.JSON(http.StatusOK, responseData)
 

diff --git a/internal/task/approval_task/repository/approval_task_repository_impl.go b/internal/task/approval_task/repository/approval_task_repository_impl.go
@@ -66,6 +66,7 @@ func (repository *ApprovalTaskRepositoryImpl) ApproveUserTask(userTaskId string)
 	if err := tx.Model(&userTask).Where("id = ?", userTaskId).Updates(map[string]interface{}{
 		"status_accept": "accept",
 		"accepted_at":   acceptedAt,
+		"reason":        "",
 	}).Error; err != nil {
 		tx.Rollback()
 		return err

diff --git a/internal/task/user_task/dto/user_task_response.go b/internal/task/user_task/dto/user_task_response.go
@@ -83,24 +83,36 @@ type UserTaskGetByIdUserResponse struct {
 }
 
 type GetUserTaskDoneByIdUserResponse struct {
-	Id             string             `json:"id"`
-	StatusProgress string             `json:"status_progress"`
-	StatusAccept   string             `json:"status_accepted"`
-	Point          int                `json:"point"`
-	ReasonReject   string             `json:"reason_reject"`
-	TaskChallenge  DataTaskChallenges `json:"task_challenge"`
-	UserSteps      []DataUserSteps    `json:"user_steps"`
+	Id             string                 `json:"id"`
+	StatusProgress string                 `json:"status_progress"`
+	StatusAccept   string                 `json:"status_accepted"`
+	Point          int                    `json:"point"`
+	ReasonReject   string                 `json:"reason_reject"`
+	TaskChallenge  DataTaskChanlengesDone `json:"task_challenge"`
+}
+
+type DataTaskChanlengesDone struct {
+	Id          string          `json:"id"`
+	Title       string          `json:"title"`
+	Description string          `json:"description"`
+	Thumbnail   string          `json:"thumbnail"`
+	StartDate   time.Time       `json:"start_date"`
+	EndDate     time.Time       `json:"end_date"`
+	StatusTask  bool            `json:"status_task"`
+	TaskSteps   []TaskSteps     `json:"task_steps"`
+	UserSteps   []DataUserSteps `json:"user_steps"`
 }
 
 type DataTaskChallenges struct {
-	Id          string      `json:"id"`
-	Title       string      `json:"title"`
-	Description string      `json:"description"`
-	Thumbnail   string      `json:"thumbnail"`
-	StartDate   time.Time   `json:"start_date"`
-	EndDate     time.Time   `json:"end_date"`
-	StatusTask  bool        `json:"status_task"`
-	TaskSteps   []TaskSteps `json:"task_steps"`
+	Id          string          `json:"id"`
+	Title       string          `json:"title"`
+	Description string          `json:"description"`
+	Thumbnail   string          `json:"thumbnail"`
+	StartDate   time.Time       `json:"start_date"`
+	EndDate     time.Time       `json:"end_date"`
+	StatusTask  bool            `json:"status_task"`
+	TaskSteps   []TaskSteps     `json:"task_steps"`
+	UserSteps   []DataUserSteps `json:"user_steps"`
 }
 
 type GetUserTaskDetailsResponse struct {

diff --git a/internal/task/user_task/handler/user_task_handler_impl.go b/internal/task/user_task/handler/user_task_handler_impl.go
@@ -314,7 +314,7 @@ func (handler *UserTaskHandlerImpl) GetUserTaskDoneByUserIdHandler(c echo.Contex
 			StatusAccept:   userTask.StatusAccept,
 			Point:          userTask.Point,
 			ReasonReject:   userTask.Reason,
-			TaskChallenge: dto.DataTaskChallenges{
+			TaskChallenge: dto.DataTaskChanlengesDone{
 				Id:          userTask.TaskChallenge.ID,
 				Title:       userTask.TaskChallenge.Title,
 				Description: userTask.TaskChallenge.Description,
@@ -323,8 +323,8 @@ func (handler *UserTaskHandlerImpl) GetUserTaskDoneByUserIdHandler(c echo.Contex
 				EndDate:     userTask.TaskChallenge.EndDate,
 				StatusTask:  userTask.TaskChallenge.Status,
 				TaskSteps:   []dto.TaskSteps{},
+				UserSteps:   []dto.DataUserSteps{},
 			},
-			UserSteps: []dto.DataUserSteps{},
 		})
 
 		for _, step := range userTask.TaskChallenge.TaskSteps {
@@ -336,7 +336,7 @@ func (handler *UserTaskHandlerImpl) GetUserTaskDoneByUserIdHandler(c echo.Contex
 		}
 
 		for _, step := range userTask.UserTaskSteps {
-			data[len(data)-1].UserSteps = append(data[len(data)-1].UserSteps, dto.DataUserSteps{
+			data[len(data)-1].TaskChallenge.UserSteps = append(data[len(data)-1].TaskChallenge.UserSteps, dto.DataUserSteps{
 				Id:                  step.ID,
 				UserTaskChallengeID: step.UserTaskChallengeID,
 				TaskStepID:          step.TaskStepID,