From 40fbb00acc6c2ff004e17b406a0d1275dff6d7de Mon Sep 17 00:00:00 2001 From: Conor Macpherson Date: Fri, 23 Dec 2022 09:18:14 -0500 Subject: [PATCH] Remove auto create if no records present, add new error message. --- api4/license.go | 8 ++++++-- i18n/en.json | 4 ++++ store/sqlstore/true_up_review_store.go | 4 +--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/api4/license.go b/api4/license.go index 2339c3afab..7eb8590017 100644 --- a/api4/license.go +++ b/api4/license.go @@ -408,8 +408,12 @@ func requestTrueUpReview(c *Context, w http.ResponseWriter, r *http.Request) { dueDate := utils.GetNextTrueUpReviewDueDate(now) status, err := c.App.Srv().Store().TrueUpReview().GetTrueUpReviewStatus(dueDate) if err != nil { - c.Err = model.NewAppError("trueUpReviewStatus", "api.license.true_up_review.get.fail.app_error", nil, "", http.StatusInternalServerError) - return + status, err = c.App.Srv().Store().TrueUpReview().CreateTrueUpReviewStatusRecord(status) + + 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. diff --git a/i18n/en.json b/i18n/en.json index a57b63d641..b76da116ab 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2081,6 +2081,10 @@ "id": "api.license.true_up_review.get.fail.app_error", "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", "translation": "A license is required to request a true up review." diff --git a/store/sqlstore/true_up_review_store.go b/store/sqlstore/true_up_review_store.go index bfb07d8b97..6c7dedd62a 100644 --- a/store/sqlstore/true_up_review_store.go +++ b/store/sqlstore/true_up_review_store.go @@ -43,9 +43,7 @@ func (s *SqlTrueUpReviewStore) GetTrueUpReviewStatus(dueDate time.Time) (*model. if err := s.GetReplicaX().Get(&trueUpReviewStatus, queryString, args...); err != nil { trueUpReviewStatus.Completed = false trueUpReviewStatus.DueDate = dueDate.Format("2006-01-02") - - // If no record is available, create one so there is a record trail. - return s.CreateTrueUpReviewStatusRecord(&trueUpReviewStatus) + return &trueUpReviewStatus, err } return &trueUpReviewStatus, nil