Revert "change(database): use string id - composite keys does not wor…

…k otherwise" This reverts commit 97a9d4a.
Migz93 · Feb 2, 2020 · ac55893 · ac55893
1 parent 2354861
commit ac55893
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 23 deletions.
diff --git a/cmd/cutoff.go b/cmd/cutoff.go
@@ -3,7 +3,6 @@ package cmd
 import (
 	"github.com/l3uddz/wantarr/database"
 	pvrObj "github.com/l3uddz/wantarr/pvr"
-	stringutils "github.com/l3uddz/wantarr/utils/strings"
 	"github.com/spf13/cobra"
 	"github.com/tommysolsen/capitalise"
 	"time"
@@ -119,7 +118,7 @@ var cutoffCmd = &cobra.Command{
 
 			// add item to batch
 			searchItems = append(searchItems, pvrObj.MediaItem{
-				ItemId:     stringutils.StringToInt(item.Id),
+				ItemId:     item.Id,
 				AirDateUtc: item.AirDateUtc,
 			})
 

diff --git a/cmd/missing.go b/cmd/missing.go
@@ -3,7 +3,6 @@ package cmd
 import (
 	"github.com/l3uddz/wantarr/database"
 	pvrObj "github.com/l3uddz/wantarr/pvr"
-	stringutils "github.com/l3uddz/wantarr/utils/strings"
 	"github.com/spf13/cobra"
 	"github.com/tommysolsen/capitalise"
 	"time"
@@ -119,7 +118,7 @@ var missingCmd = &cobra.Command{
 
 			// add item to batch
 			searchItems = append(searchItems, pvrObj.MediaItem{
-				ItemId:     stringutils.StringToInt(item.Id),
+				ItemId:     item.Id,
 				AirDateUtc: item.AirDateUtc,
 			})
 

diff --git a/database/delete.go b/database/delete.go
@@ -3,15 +3,14 @@ package database
 import (
 	"github.com/l3uddz/wantarr/pvr"
 	"github.com/pkg/errors"
-	"strconv"
 )
 
 func DeleteMissingItems(pvrName string, wantedType string, newMediaItems []pvr.MediaItem) (int, error) {
 	// build slice of new item ids
-	newItemIds := make(map[string]*string, 0)
+	newItemIds := make(map[int]*string, 0)
 
 	for _, item := range newMediaItems {
-		newItemIds[strconv.Itoa(item.ItemId)] = nil
+		newItemIds[item.ItemId] = nil
 	}
 
 	// begin transaction

diff --git a/database/schema.go b/database/schema.go
@@ -3,7 +3,7 @@ package database
 import "time"
 
 type MediaItem struct {
-	Id                string `gorm:"primary_key"`
+	Id                int    `gorm:"primary_key"`
 	PvrName           string `gorm:"primary_key"`
 	WantedType        string `gorm:"primary_key"`
 	AirDateUtc        time.Time

diff --git a/database/set.go b/database/set.go
@@ -3,7 +3,6 @@ package database
 import (
 	"github.com/l3uddz/wantarr/pvr"
 	"github.com/pkg/errors"
-	"strconv"
 )
 
 func SetMediaItems(pvrName string, wantedType string, mediaItems []pvr.MediaItem) error {
@@ -21,7 +20,7 @@ func SetMediaItems(pvrName string, wantedType string, mediaItems []pvr.MediaItem
 
 		// create item if not exists
 		err := tx.Where(MediaItem{
-			Id:         strconv.Itoa(item.ItemId),
+			Id:         item.ItemId,
 			PvrName:    pvrName,
 			WantedType: wantedType,
 		}).Assign(mediaItem).FirstOrCreate(&mediaItem).Error

diff --git a/utils/strings/conv.go b/utils/strings/conv.go