Release v0.1.6

Author: github-actions[bot]

.github/workflows/build.yml

@@ -5,22 +5,34 @@ on:
   pull_request:
 
 jobs:
-
   build:
     runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/checkout@v2
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
+
+      - name: Fix go.sum for dependabot branches
+        if: ${{ startsWith(github.ref, 'refs/heads/dependabot/go_modules/') }}
+        run: go get ./...
+
+      - name: Commit & push updated go.sum for dependabot branches
+        if: ${{ startsWith(github.ref, 'refs/heads/dependabot/go_modules/') }}
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Update go.sum
+          file_pattern: go.sum
 
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.16
+      - name: Build
+        run: go build -v ./...
 
-    - name: Build
-      run: go build -v ./...
+      - name: Test
+        run: go test -v ./...
 
-    - name: Test
-      run: go test -v ./...
-      
-    - name: Check formatting
-      run: go fmt ./... && git diff --exit-code
+      - name: Check formatting
+        run: go fmt ./... && git diff --exit-code

.idea/vcs.xml

@@ -1,9 +1,11 @@
 package authentication
 
 import (
+	"crypto/rand"
 	"github.com/47-11/spotifete/database"
 	"github.com/47-11/spotifete/database/model"
-	"math/rand"
+	. "github.com/47-11/spotifete/shared"
+	"math/big"
 )
 
 var letterRunes = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
@@ -19,33 +21,53 @@ func GetSession(sessionId string) *model.LoginSession {
 	}
 }
 
-func NewSession(callbackRedirectUrl string) (newSession model.LoginSession, spotifyAuthUrl string) {
+func NewSession(callbackRedirectUrl string) (newSession model.LoginSession, spotifyAuthUrl string, error *SpotifeteError) {
+	sessionId, spotifeteError := newSessionId()
+	if spotifeteError != nil {
+		return model.LoginSession{}, "", spotifeteError
+	}
+
 	newSession = model.LoginSession{
 		BaseModel:        model.BaseModel{},
-		SessionId:        newSessionId(),
+		SessionId:        sessionId,
 		UserId:           nil,
 		Active:           true,
 		CallbackRedirect: callbackRedirectUrl,
 	}
 
 	database.GetConnection().Create(&newSession)
-	return newSession, authUrlForSession(newSession)
+	return newSession, authUrlForSession(newSession), nil
 }
 
-func newSessionId() string {
+func newSessionId() (string, *SpotifeteError) {
 	for {
-		b := make([]rune, 256)
-		for i := range b {
-			b[i] = letterRunes[rand.Intn(len(letterRunes))]
+		newSessionId, spotifeteError := randomSessionId()
+		if spotifeteError != nil {
+			return "", spotifeteError
 		}
-		newSessionId := string(b)
 
 		if !sessionIdExists(newSessionId) {
-			return newSessionId
+			return newSessionId, nil
 		}
 	}
 }
 
+func randomSessionId() (string, *SpotifeteError) {
+	maxRandValue := big.NewInt(int64(len(letterRunes)))
+
+	b := make([]rune, 256)
+	for i := range b {
+		randInt, err := rand.Int(rand.Reader, maxRandValue)
+		if err != nil {
+			return "", NewInternalError("Could not generate random int", err)
+		}
+
+		b[i] = letterRunes[randInt.Uint64()]
+	}
+
+	return string(b), nil
+}
+
 func sessionIdExists(sessionId string) bool {
 	var count int64
 

authentication/session.go

@@ -8,7 +8,7 @@ import (
 	"gorm.io/gorm"
 )
 
-const targetDatabaseVersion = 31
+const targetDatabaseVersion = 32
 
 func migrateIfNecessary(db *gorm.DB) {
 	logger.Info("Connection acquired. Checking database version")

database/migration.go

@@ -4,7 +4,7 @@ type SimpleListeningSession struct {
 	BaseModel
 	Active             bool    `json:"active"`
 	OwnerId            uint    `json:"owner_id"`
-	JoinId             *string `json:"join_id"`
+	JoinId             string  `json:"join_id"`
 	QueuePlaylistId    string  `gorm:"column:queue_playlist" json:"queue_playlist_id"`
 	Title              string  `json:"title"`
 	FallbackPlaylistId *string `gorm:"column:fallback_playlist" json:"fallback_playlist_id"`
@@ -17,7 +17,7 @@ func (SimpleListeningSession) TableName() string {
 type FullListeningSession struct {
 	SimpleListeningSession
 	Owner                    SimpleUser        `gorm:"foreignKey:owner_id" json:"owner"`
-	FallbackPlaylistMetadata *PlaylistMetadata `gorm:"foreignKey:fallback_playlist" json:"fallback_playlist_metadata"`
+	FallbackPlaylistMetadata *PlaylistMetadata `gorm:"foreignKey:fallback_playlist;references:spotify_playlist_id" json:"fallback_playlist_metadata"`
 }
 
 func (FullListeningSession) TableName() string {

database/model/listeningSession.go

@@ -5,7 +5,7 @@ type SongRequest struct {
 	SessionId      uint              `json:"session_id"`
 	UserId         *uint             `json:"user_id"`
 	SpotifyTrackId string            `json:"spotify_track_id"`
-	TrackMetadata  TrackMetadata     `gorm:"foreignKey:spotify_track_id" json:"track_metadata"`
+	TrackMetadata  TrackMetadata     `gorm:"foreignKey:spotify_track_id;references:spotify_track_id" json:"track_metadata"`
 	Status         SongRequestStatus `json:"status"`
 }
 

database/model/songRequest.go

@@ -25,15 +25,15 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.7.1
 	github.com/ugorji/go v1.2.4 // indirect
-	github.com/zmb3/spotify v1.1.0
+	github.com/zmb3/spotify v1.1.1
 	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
-	golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d // indirect
+	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
 	golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93
-	golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43 // indirect
+	golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b // indirect
 	golang.org/x/text v0.3.5 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	gopkg.in/ini.v1 v1.62.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gorm.io/driver/postgres v1.0.8
-	gorm.io/gorm v1.20.12
+	gorm.io/gorm v1.21.2
 )

go.mod

@@ -244,7 +244,6 @@ github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51
 github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
 github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
@@ -541,8 +540,9 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
@@ -576,8 +576,8 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
-github.com/zmb3/spotify v1.1.0 h1:bFn7yV3eSvJcwnDiI+iDcMdEVE+Fncl9/eHOkClzvGg=
-github.com/zmb3/spotify v1.1.0/go.mod h1:CYu0Uo+YYMlUX39zUTsCU9j3SpK3l1eB8oLykXF7R7w=
+github.com/zmb3/spotify v1.1.1 h1:3v2IxmzMrvl/1mieDINOI4JAXCJYWP/NQ4o2A1Ni35k=
+github.com/zmb3/spotify v1.1.1/go.mod h1:GD7AAEMUJVYc2Z7p2a2S0E3/5f/KxM/vOnErNr4j+Tw=
 gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
@@ -683,8 +683,8 @@ golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201029221708-28c70e62bb1d/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d h1:1aflnvSoWWLI2k/dMUAl5lvU1YO4Mb4hz0gh+1rjcxU=
-golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -750,8 +750,8 @@ golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201029080932-201ba4db2418/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43 h1:SgQ6LNaYJU0JIuEHv9+s6EbhSCwYeAf5Yvj6lpYlqAE=
-golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b h1:ggRgirZABFolTmi3sn6Ivd9SipZwLedQ5wR0aAKnFxU=
+golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -764,7 +764,6 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s=
 golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -944,9 +943,9 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/postgres v1.0.8 h1:PAgM+PaHOSAeroTjHkCHCBIHHoBIf9RgPWGo8dF2DA8=
 gorm.io/driver/postgres v1.0.8/go.mod h1:4eOzrI1MUfm6ObJU/UcmbXyiHSs8jSwH95G5P5dxcAg=
-gorm.io/gorm v1.20.12 h1:ebZ5KrSHzet+sqOCVdH9mTjW91L298nX3v5lVxAzSUY=
 gorm.io/gorm v1.20.12/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
-gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
+gorm.io/gorm v1.21.2 h1:E9FgSzS9qZneyf5MlXTJBYEZ2ZZKrB993s2v+XBu7vo=
+gorm.io/gorm v1.21.2/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

go.sum

@@ -10,6 +10,7 @@ import (
 	"math/rand"
 	"net/http"
 	"strings"
+	"time"
 )
 
 var numberRunes = []rune("0123456789")
@@ -29,9 +30,13 @@ func GetActiveSessionCount() uint {
 func FindSimpleListeningSession(filter model.SimpleListeningSession) *model.SimpleListeningSession {
 	listeningSessions := FindSimpleListeningSessions(filter)
 
-	if len(listeningSessions) == 1 {
+	resultCount := len(listeningSessions)
+	if resultCount == 1 {
 		return &listeningSessions[0]
+	} else if resultCount == 0 {
+		return nil
 	} else {
+		NewInternalError(fmt.Sprintf("Got more than one result for filter %v", filter), nil)
 		return nil
 	}
 }
@@ -45,9 +50,13 @@ func FindSimpleListeningSessions(filter model.SimpleListeningSession) []model.Si
 func FindFullListeningSession(filter model.SimpleListeningSession) *model.FullListeningSession {
 	listeningSessions := FindFullListeningSessions(filter)
 
-	if len(listeningSessions) == 1 {
+	resultCount := len(listeningSessions)
+	if resultCount == 1 {
 		return &listeningSessions[0]
+	} else if resultCount == 0 {
+		return nil
 	} else {
+		NewInternalError(fmt.Sprintf("Got more than one result for filter %v", filter), nil)
 		return nil
 	}
 }
@@ -88,7 +97,7 @@ func NewSession(user model.SimpleUser, title string) (*model.SimpleListeningSess
 		BaseModel:       model.BaseModel{},
 		Active:          true,
 		OwnerId:         user.ID,
-		JoinId:          &joinId,
+		JoinId:          joinId,
 		QueuePlaylistId: playlist.ID.String(),
 		Title:           title,
 	}
@@ -99,6 +108,8 @@ func NewSession(user model.SimpleUser, title string) (*model.SimpleListeningSess
 }
 
 func newJoinId() string {
+	rand.Seed(time.Now().UnixNano())
+
 	for {
 		b := make([]rune, 8)
 		for i := range b {
@@ -114,15 +125,17 @@ func newJoinId() string {
 
 func joinIdFree(joinId string) bool {
 	existingListeningSession := FindSimpleListeningSession(model.SimpleListeningSession{
-		JoinId: &joinId,
+		JoinId: joinId,
+		Active: true,
 	})
 
 	return existingListeningSession == nil
 }
 
 func CloseSession(user model.SimpleUser, joinId string) *SpotifeteError {
 	session := FindSimpleListeningSession(model.SimpleListeningSession{
-		JoinId: &joinId,
+		JoinId: joinId,
+		Active: true,
 	})
 	if session == nil {
 		return NewUserError("Unknown listening session.")
@@ -133,7 +146,6 @@ func CloseSession(user model.SimpleUser, joinId string) *SpotifeteError {
 	}
 
 	session.Active = false
-	session.JoinId = nil
 	database.GetConnection().Save(&session)
 	// TODO: Use a transaction here
 

listeningSession/listeningSession.go

@@ -1,9 +1,10 @@
 package listeningSession
 
 import (
+	"fmt"
 	"github.com/47-11/spotifete/database"
 	"github.com/47-11/spotifete/database/model"
-	"github.com/47-11/spotifete/shared"
+	. "github.com/47-11/spotifete/shared"
 	"github.com/zmb3/spotify"
 	"sort"
 	"time"
@@ -12,9 +13,13 @@ import (
 func FindSongRequest(filter model.SongRequest) *model.SongRequest {
 	songRequests := FindSongRequests(filter)
 
-	if len(songRequests) == 1 {
+	resultCount := len(songRequests)
+	if resultCount == 1 {
 		return &songRequests[0]
+	} else if resultCount == 0 {
+		return nil
 	} else {
+		NewInternalError(fmt.Sprintf("Got more than one result for filter %v", filter), nil)
 		return nil
 	}
 }
@@ -89,17 +94,17 @@ func GetDistinctRequestedTracks(session model.SimpleListeningSession) (trackIds
 	return
 }
 
-func DeleteRequestFromQueue(session model.SimpleListeningSession, spotifyTrackId string) *shared.SpotifeteError {
+func DeleteRequestFromQueue(session model.SimpleListeningSession, spotifyTrackId string) *SpotifeteError {
 	requestToDelete := FindSongRequest(model.SongRequest{
 		SessionId:      session.ID,
 		SpotifyTrackId: spotifyTrackId,
 	})
 	if requestToDelete == nil {
-		return shared.NewUserError("Request not found in queue.")
+		return NewUserError("Request not found in queue.")
 	}
 
 	if requestToDelete.Status != model.StatusInQueue {
-		return shared.NewUserError("The request must be in the queue to be deleted.")
+		return NewUserError("The request must be in the queue to be deleted.")
 	}
 
 	database.GetConnection().Delete(requestToDelete)