From 97b747b452209f474f4fd7a07f4c45009aabe509 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Thu, 29 Sep 2022 12:33:33 +0200
Subject: [PATCH] [bugfix] Fix incorrect use of bun.Ident (#866)

* remove misused bun.Ident

* test status delete via API

* fix test
---
 .../api/client/status/statusdelete_test.go    | 91 +++++++++++++++++++
 internal/db/bundb/status.go                   |  4 +-
 2 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 internal/api/client/status/statusdelete_test.go

diff --git a/internal/api/client/status/statusdelete_test.go b/internal/api/client/status/statusdelete_test.go
new file mode 100644
index 000000000..f97a13eec
--- /dev/null
+++ b/internal/api/client/status/statusdelete_test.go
@@ -0,0 +1,91 @@
+/*
+   GoToSocial
+   Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Affero General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Affero General Public License for more details.
+   You should have received a copy of the GNU Affero General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package status_test
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/gin-gonic/gin"
+	"github.com/stretchr/testify/suite"
+	"github.com/superseriousbusiness/gotosocial/internal/api/client/status"
+	"github.com/superseriousbusiness/gotosocial/internal/api/model"
+	"github.com/superseriousbusiness/gotosocial/internal/db"
+	"github.com/superseriousbusiness/gotosocial/internal/oauth"
+	"github.com/superseriousbusiness/gotosocial/testrig"
+)
+
+type StatusDeleteTestSuite struct {
+	StatusStandardTestSuite
+}
+
+func (suite *StatusDeleteTestSuite) TestPostDelete() {
+	t := suite.testTokens["local_account_1"]
+	oauthToken := oauth.DBTokenToToken(t)
+	targetStatus := suite.testStatuses["local_account_1_status_1"]
+
+	// setup
+	recorder := httptest.NewRecorder()
+	ctx, _ := testrig.CreateGinTestContext(recorder, nil)
+	ctx.Set(oauth.SessionAuthorizedApplication, suite.testApplications["application_1"])
+	ctx.Set(oauth.SessionAuthorizedToken, oauthToken)
+	ctx.Set(oauth.SessionAuthorizedUser, suite.testUsers["local_account_1"])
+	ctx.Set(oauth.SessionAuthorizedAccount, suite.testAccounts["local_account_1"])
+	ctx.Request = httptest.NewRequest(http.MethodDelete, fmt.Sprintf("http://localhost:8080%s", strings.Replace(status.BasePathWithID, ":id", targetStatus.ID, 1)), nil) // the endpoint we're hitting
+	ctx.Request.Header.Set("accept", "application/json")
+
+	// normally the router would populate these params from the path values,
+	// but because we're calling the function directly, we need to set them manually.
+	ctx.Params = gin.Params{
+		gin.Param{
+			Key:   status.IDKey,
+			Value: targetStatus.ID,
+		},
+	}
+
+	suite.statusModule.StatusDELETEHandler(ctx)
+
+	// check response
+	suite.EqualValues(http.StatusOK, recorder.Code)
+
+	result := recorder.Result()
+	defer result.Body.Close()
+	b, err := ioutil.ReadAll(result.Body)
+	suite.NoError(err)
+
+	statusReply := &model.Status{}
+	err = json.Unmarshal(b, statusReply)
+	suite.NoError(err)
+	suite.NotNil(statusReply)
+
+	if !testrig.WaitFor(func() bool {
+		_, err := suite.db.GetStatusByID(ctx, targetStatus.ID)
+		return errors.Is(err, db.ErrNoEntries)
+	}) {
+		suite.FailNow("time out waiting for status to be deleted")
+	}
+
+}
+
+func TestStatusDeleteTestSuite(t *testing.T) {
+	suite.Run(t, new(StatusDeleteTestSuite))
+}
diff --git a/internal/db/bundb/status.go b/internal/db/bundb/status.go
index 59417afe4..2d920ee3f 100644
--- a/internal/db/bundb/status.go
+++ b/internal/db/bundb/status.go
@@ -233,7 +233,7 @@ func (s *statusDB) DeleteStatusByID(ctx context.Context, id string) db.Error {
 		if _, err := tx.
 			NewDelete().
 			Model(&gtsmodel.StatusToEmoji{}).
-			Where("status_id = ?", bun.Ident(id)).
+			Where("status_id = ?", id).
 			Exec(ctx); err != nil {
 			return err
 		}
@@ -242,7 +242,7 @@ func (s *statusDB) DeleteStatusByID(ctx context.Context, id string) db.Error {
 		if _, err := tx.
 			NewDelete().
 			Model(&gtsmodel.StatusToTag{}).
-			Where("status_id = ?", bun.Ident(id)).
+			Where("status_id = ?", id).
 			Exec(ctx); err != nil {
 			return err
 		}