Merge pull request #247 from answerdev/hotfix/1.0.6/answer

Hotfix/1.0.6/answer

Author: aichy126

internal/controller/answer_controller.go

@@ -136,6 +136,24 @@ func (ac *AnswerController) Add(ctx *gin.Context) {
 		handler.HandleResponse(ctx, nil, nil)
 		return
 	}
+
+	canList, err := ac.rankService.CheckOperationPermissions(ctx, req.UserID, []string{
+		permission.AnswerEdit,
+		permission.AnswerDelete,
+	})
+	if err != nil {
+		handler.HandleResponse(ctx, err, nil)
+		return
+	}
+
+	objectOwner := ac.rankService.CheckOperationObjectOwner(ctx, req.UserID, info.ID)
+	req.CanEdit = canList[0] || objectOwner
+	req.CanDelete = canList[1] || objectOwner
+	if !can {
+		handler.HandleResponse(ctx, errors.Forbidden(reason.RankFailToMeetTheCondition), nil)
+		return
+	}
+	info.MemberActions = permission.GetAnswerPermission(ctx, req.UserID, info.UserID, req.CanEdit, req.CanDelete)
 	handler.HandleResponse(ctx, nil, gin.H{
 		"info":     info,
 		"question": questionInfo,

internal/schema/answer_schema.go

@@ -24,6 +24,8 @@ type AnswerAddReq struct {
 	Content    string `validate:"required,notblank,gte=6,lte=65535" json:"content"`
 	HTML       string `json:"-"`
 	UserID     string `json:"-"`
+	CanEdit    bool   `json:"-"`
+	CanDelete  bool   `json:"-"`
 }
 
 func (req *AnswerAddReq) Check() (errFields []*validator.FormErrorField, err error) {

internal/service/answer_service.go

@@ -92,19 +92,14 @@ func (as *AnswerService) RemoveAnswer(ctx context.Context, req *schema.RemoveAns
 		if answerInfo.Accepted == schema.AnswerAcceptedEnable {
 			return errors.BadRequest(reason.AnswerCannotDeleted)
 		}
-		questionInfo, exist, err := as.questionRepo.GetQuestion(ctx, answerInfo.QuestionID)
+		_, exist, err := as.questionRepo.GetQuestion(ctx, answerInfo.QuestionID)
 		if err != nil {
 			return errors.BadRequest(reason.AnswerCannotDeleted)
 		}
 		if !exist {
 			return errors.BadRequest(reason.AnswerCannotDeleted)
 		}
-		if questionInfo.AnswerCount > 1 {
-			return errors.BadRequest(reason.AnswerCannotDeleted)
-		}
-		if questionInfo.AcceptedAnswerID != "" {
-			return errors.BadRequest(reason.AnswerCannotDeleted)
-		}
+
 	}
 
 	// user add question count