Remove auto create if no records present, add new error message.
Этот коммит содержится в:
@@ -408,8 +408,12 @@ func requestTrueUpReview(c *Context, w http.ResponseWriter, r *http.Request) {
|
|||||||
dueDate := utils.GetNextTrueUpReviewDueDate(now)
|
dueDate := utils.GetNextTrueUpReviewDueDate(now)
|
||||||
status, err := c.App.Srv().Store().TrueUpReview().GetTrueUpReviewStatus(dueDate)
|
status, err := c.App.Srv().Store().TrueUpReview().GetTrueUpReviewStatus(dueDate)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.Err = model.NewAppError("trueUpReviewStatus", "api.license.true_up_review.get.fail.app_error", nil, "", http.StatusInternalServerError)
|
status, err = c.App.Srv().Store().TrueUpReview().CreateTrueUpReviewStatusRecord(status)
|
||||||
return
|
|
||||||
|
if err != nil {
|
||||||
|
c.Err = model.NewAppError("requestTrueUpReview", "api.license.true_up_review.create.fail.app_error", nil, "", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Do not send true-up review data if the user has already requested one for the quarter.
|
// Do not send true-up review data if the user has already requested one for the quarter.
|
||||||
|
|||||||
@@ -2081,6 +2081,10 @@
|
|||||||
"id": "api.license.true_up_review.get.fail.app_error",
|
"id": "api.license.true_up_review.get.fail.app_error",
|
||||||
"translation": "Unable to get true up review records."
|
"translation": "Unable to get true up review records."
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "api.license.true_up_review.create.fail.app_error",
|
||||||
|
"translation": "Unable to create a true up review record."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "api.license.true_up_review.license.required",
|
"id": "api.license.true_up_review.license.required",
|
||||||
"translation": "A license is required to request a true up review."
|
"translation": "A license is required to request a true up review."
|
||||||
|
|||||||
@@ -43,9 +43,7 @@ func (s *SqlTrueUpReviewStore) GetTrueUpReviewStatus(dueDate time.Time) (*model.
|
|||||||
if err := s.GetReplicaX().Get(&trueUpReviewStatus, queryString, args...); err != nil {
|
if err := s.GetReplicaX().Get(&trueUpReviewStatus, queryString, args...); err != nil {
|
||||||
trueUpReviewStatus.Completed = false
|
trueUpReviewStatus.Completed = false
|
||||||
trueUpReviewStatus.DueDate = dueDate.Format("2006-01-02")
|
trueUpReviewStatus.DueDate = dueDate.Format("2006-01-02")
|
||||||
|
return &trueUpReviewStatus, err
|
||||||
// If no record is available, create one so there is a record trail.
|
|
||||||
return s.CreateTrueUpReviewStatusRecord(&trueUpReviewStatus)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return &trueUpReviewStatus, nil
|
return &trueUpReviewStatus, nil
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user