From 2578a74ddbd1b4493d839b100550f68bb7eee739 Mon Sep 17 00:00:00 2001
From: Rhys Lloyd <krakow20@gmail.com>
Date: Wed, 23 Jul 2025 23:18:34 -0700
Subject: [PATCH] submissions: use unsigned ints in maps struct

---
 pkg/controller/maps.go     | 8 ++++----
 pkg/model/map.go           | 8 ++++----
 pkg/service/maps.go        | 5 +++--
 pkg/web_api/maps.go        | 4 ++--
 pkg/web_api/submissions.go | 5 ++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkg/controller/maps.go b/pkg/controller/maps.go
index 2110034..d751d64 100644
--- a/pkg/controller/maps.go
+++ b/pkg/controller/maps.go
@@ -32,11 +32,11 @@ func (svc *Maps) Create(ctx context.Context, request *maps_extended.MapCreate) (
 		ID:           request.ID,
 		DisplayName:  request.DisplayName,
 		Creator:      request.Creator,
-		GameID:       int32(request.GameID),
-		Submitter:    int64(request.Submitter),
+		GameID:       request.GameID,
+		Submitter:    request.Submitter,
 		Date:         time.Unix(request.Date, 0),
-		Thumbnail:    int64(request.Thumbnail),
-		AssetVersion: int64(request.AssetVersion),
+		Thumbnail:    request.Thumbnail,
+		AssetVersion: request.AssetVersion,
 		LoadCount:    0,
 		Modes:        request.Modes,
 	})
diff --git a/pkg/model/map.go b/pkg/model/map.go
index 314b678..78298f3 100644
--- a/pkg/model/map.go
+++ b/pkg/model/map.go
@@ -6,13 +6,13 @@ type Map struct {
 	ID           int64
 	DisplayName  string
 	Creator      string
-	GameID       int32
+	GameID       uint32
 	Date         time.Time // Release date
 	CreatedAt    time.Time
 	UpdatedAt    time.Time
-	Submitter    int64     // UserID of submitter
-	Thumbnail    int64     // AssetID of thumbnail
-	AssetVersion int64     // Version number for LoadAssetVersion
+	Submitter    uint64    // UserID of submitter
+	Thumbnail    uint64    // AssetID of thumbnail
+	AssetVersion uint64    // Version number for LoadAssetVersion
 	LoadCount    uint32    // How many times the map has been loaded
 	Modes        uint32    // Number of modes (always at least one)
 }
diff --git a/pkg/service/maps.go b/pkg/service/maps.go
index 4294f10..beb6809 100644
--- a/pkg/service/maps.go
+++ b/pkg/service/maps.go
@@ -93,7 +93,7 @@ func (svc *Service) TEMP_DoMapsMigration(ctx context.Context) (error) {
 			ID:           item.ID,
 			DisplayName:  item.DisplayName,
 			Creator:      item.Creator,
-			GameID:       item.GameID,
+			GameID:       uint32(item.GameID),
 			Date:         time.Unix(item.Date, 0),
 			// CreatedAt:    time.Time{},
 			// UpdatedAt:    time.Time{},
@@ -119,11 +119,12 @@ func (svc *Service) CreateMap(ctx context.Context, item model.Map) (int64, error
 	}
 	// create map on data-service
 	date := item.Date.Unix()
+	game_id := int32(item.GameID)
 	_, err = svc.maps.Create(ctx, &maps.MapRequest{
 		ID:          item.ID,
 		DisplayName: &item.DisplayName,
 		Creator:     &item.Creator,
-		GameID:      &item.GameID,
+		GameID:      &game_id,
 		Date:        &date,
 	})
 	if err != nil {
diff --git a/pkg/web_api/maps.go b/pkg/web_api/maps.go
index c3bdde0..0475992 100644
--- a/pkg/web_api/maps.go
+++ b/pkg/web_api/maps.go
@@ -67,7 +67,7 @@ func (svc *Service) ListMaps(ctx context.Context, params api.ListMapsParams) ([]
 			ID:           item.ID,
 			DisplayName:  item.DisplayName,
 			Creator:      item.Creator,
-			GameID:       item.GameID,
+			GameID:       int32(item.GameID),
 			Date:         item.Date.Unix(),
 		})
 	}
@@ -90,7 +90,7 @@ func (svc *Service) GetMap(ctx context.Context, params api.GetMapParams) (*api.M
 		ID:           mapResponse.ID,
 		DisplayName:  mapResponse.DisplayName,
 		Creator:      mapResponse.Creator,
-		GameID:       mapResponse.GameID,
+		GameID:       int32(mapResponse.GameID),
 		Date:         mapResponse.Date.Unix(),
 	}, nil
 }
diff --git a/pkg/web_api/submissions.go b/pkg/web_api/submissions.go
index 158701b..a167454 100644
--- a/pkg/web_api/submissions.go
+++ b/pkg/web_api/submissions.go
@@ -1076,15 +1076,14 @@ func (svc *Service) ReleaseSubmissions(ctx context.Context, request []api.Releas
 
 	for i,submission := range submissions{
 		date := request[i].Date.Unix()
-		var GameID = int32(submission.GameID)
 		// create each map with go-grpc
 		_, err := svc.inner.CreateMap(ctx, model.Map{
 			ID:           int64(submission.UploadedAssetID),
 			DisplayName:  submission.DisplayName,
 			Creator:      submission.Creator,
-			GameID:       GameID,
+			GameID:       submission.GameID,
 			Date:         time.Unix(date, 0),
-			Submitter:    int64(submission.Submitter),
+			Submitter:    submission.Submitter,
 			// Thumbnail:    0,
 			// AssetVersion: 0,
 			// LoadCount:    0,