Marketplace Repository

go.mod

@@ -7,6 +7,7 @@ toolchain go1.24.7
 require (
 	github.com/go-chi/render v1.0.3
 	github.com/go-viper/mapstructure/v2 v2.4.0
+	github.com/google/go-cmp v0.7.0
 	github.com/spf13/viper v1.21.0
 	go.uber.org/zap v1.27.0
 	google.golang.org/protobuf v1.36.11

internal/config/config.go

@@ -7,17 +7,12 @@ import (
 	"reflect"
 	"strings"
 
+	"reverse-watch/internal/domain/models/constants"
+
 	"github.com/go-viper/mapstructure/v2"
 	"github.com/spf13/viper"
 )
 
-type Environment string
-
-const (
-	Development Environment = "development"
-	Production Environment = "production"
-)
-
 type Config struct {
 	// StaticDir is the directory containing the database files
 	// This is relative to the project's root directory
@@ -27,7 +22,7 @@ type Config struct {
  Port string
 	}
 
-	Environment Environment
+	Environment constants.Environment
 }
 
 func Load() Config {
@@ -39,13 +34,13 @@ func load() Config {
 
 	opts := viper.DecodeHook(mapstructure.ComposeDecodeHookFunc(
  func(from reflect.Value, to reflect.Value) (interface{}, error) {
- if from.Kind() != reflect.String || to.Type() != reflect.TypeOf(Environment("")) {
+ if from.Kind() != reflect.String || to.Type() != reflect.TypeOf(constants.Environment("")) {
  return from.Interface(), nil
  }
 
- env := Environment(from.String())
+ env := constants.Environment(from.String())
  switch env {
- case Development, Production:
+ case constants.EnvironmentDevelopment, constants.EnvironmentProduction:
  return env, nil
  default:
  return nil, fmt.Errorf("invalid environment")
@@ -55,7 +50,7 @@ func load() Config {
 
 	v.SetDefault("StaticDir", "./static")
 	v.SetDefault("HTTP.Port", "8080")
-	v.SetDefault("Environment", Development)
+	v.SetDefault("Environment", constants.EnvironmentDevelopment)
 
 	dir, err := GetProjectRootDir()
 	if err != nil {

internal/domain/dto/adminaudit.go

@@ -0,0 +1,10 @@
+package dto
+
+import (
+	"reverse-watch/internal/domain/models"
+)
+
+type AdminAuditListOptions struct {
+	TargetActions []models.TargetAction
+	TargetResource *models.Snowflake
+}

internal/domain/models/cursor.go → internal/domain/dto/cursor.go

@@ -1,17 +1,18 @@
-package models
+package dto
 
 import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
 
-	cpb "reverse-watch/internal/domain/models/cursorpb"
+	cpb "reverse-watch/internal/domain/dto/cursorpb"
+	"reverse-watch/internal/domain/models"
 
 	"google.golang.org/protobuf/proto"
 )
 
 type Cursor struct {
-	ID Snowflake
+	ID models.Snowflake
 	ReversedAt uint64
 }
 
@@ -64,7 +65,7 @@ func DecodeCursor(encoded string) (*Cursor, error) {
 	}
 
 	return &Cursor{
- ID: Snowflake(cursorpb.Id),
+ ID: models.Snowflake(cursorpb.Id),
  ReversedAt: cursorpb.ReversedAt,
 	}, nil
 }

internal/domain/dto/key.go

@@ -0,0 +1,24 @@
+package dto
+
+import (
+	"reverse-watch/internal/domain/models"
+	"reverse-watch/internal/domain/models/constants"
+)
+
+// RawKey represents an unhashed API key returned to the consumer upon creation
+type RawKey struct {
+	// ID is the key's hash
+	ID string `json:"id"`
+	Environment constants.Environment `json:"environment"`
+	SecretKey string `json:"secret_key"`
+	MarketplaceSlug string `json:"marketplace_slug"`
+	Permissions models.Permissions `json:"permissions"`
+}
+
+type KeyUpdateOptions struct {
+	Permissions *models.Permissions
+}
+
+type KeyListOptions struct {
+	MarketplaceSlug *string
+}

internal/domain/dto/marketplace.go

@@ -0,0 +1,30 @@
+package dto
+
+import (
+	"fmt"
+)
+
+type MarketplaceUpdateOptions struct {
+	Name *string
+	IsActive *bool
+}
+
+func (o *MarketplaceUpdateOptions) ToFields() map[string]interface{} {
+	fields := make(map[string]interface{})
+	if o.Name != nil {
+ fields["name"] = *o.Name
+	}
+	if o.IsActive != nil {
+ fields["is_active"] = *o.IsActive
+	}
+	return fields
+}
+
+func (o *MarketplaceUpdateOptions) Validate() error {
+	if o.Name != nil {
+ if len(*o.Name) <= 0 || len(*o.Name) > 50 {
+ return fmt.Errorf("name must be between 1 and 50 characters long")
+ }
+	}
+	return nil
+}

internal/domain/dto/marketplace_test.go

@@ -0,0 +1,56 @@
+package dto
+
+import (
+	"reflect"
+	"testing"
+
+	"reverse-watch/internal/domain/models"
+)
+
+func TestMarketplaceUpdateOptions_FieldCoverage(t *testing.T) {
+	t.Parallel()
+
+	optsType := reflect.TypeOf((*MarketplaceUpdateOptions)(nil)).Elem()
+	marketplaceType := reflect.TypeOf((*models.Marketplace)(nil)).Elem()
+
+	excludedFieldNames := []string{
+ "CreatedAt",
+ "UpdatedAt",
+	}
+
+	marketplaceFields := make(map[string]reflect.StructField)
+	for i := 0; i < marketplaceType.NumField(); i++ {
+ field := marketplaceType.Field(i)
+ marketplaceFields[field.Name] = field
+	}
+
+	for i := 0; i < optsType.NumField(); i++ {
+ optsField := optsType.Field(i)
+
+ excluded := false
+ for _, excludedFieldName := range excludedFieldNames {
+ if optsField.Name == excludedFieldName {
+ excluded = true
+ break
+ }
+ }
+ if excluded {
+ continue
+ }
+
+ marketplaceField, ok := marketplaceFields[optsField.Name]
+ if !ok {
+ t.Errorf("MarketplaceUpdateOptions contains non-existent Marketplace field: %s", optsField.Name)
+ continue
+ }
+
+ if optsField.Type.Kind() != reflect.Ptr {
+ t.Errorf("MarketplaceUpdateOptions contains non-pointer field: %s", optsField.Name)
+ }
+
+ // Ensure same type
+ if optsField.Type.Kind() == reflect.Ptr && marketplaceField.Type != optsField.Type.Elem() {
+ t.Errorf("MarketplaceUpdateOptions contains field %q with incorrect type", optsField.Name)
+ }
+	}
+}

internal/domain/dto/reversal.go

@@ -0,0 +1,12 @@
+package dto
+
+import (
+	"reverse-watch/internal/domain/models"
+)
+
+type ReversalListOptions struct {
+	SteamID *models.SteamID
+	MarketplaceSlug *string
+	Cursor *Cursor
+	Limit *uint
+}

internal/domain/models/constants/environment.go

@@ -0,0 +1,8 @@
+package constants
+
+type Environment string
+
+const (
+	EnvironmentDevelopment Environment = "development"
+	EnvironmentProduction Environment = "production"
+)

internal/domain/models/key.go

@@ -3,20 +3,20 @@ package models
 import (
 	"fmt"
 
-	"reverse-watch/internal/config"
+	"reverse-watch/internal/domain/models/constants"
 
 	"gorm.io/gorm"
 )
 
 type Key struct {
 	// ID is the hash of the secret key
-	ID string `gorm:"primaryKey" json:"-"`
-	CreatedAt uint64 `gorm:"autoCreateTime:milli" json:"created_at"`
-	UpdatedAt uint64 `gorm:"autoUpdateTime:milli" json:"updated_at"`
-	Environment config.Environment `json:"-"`
-	MarketplaceSlug string `json:"marketplace_slug"`
-	Marketplace *Marketplace `json:"-"`
-	Permissions Permissions `json:"permissions"`
+	ID string `gorm:"primaryKey" json:"id"`
+	CreatedAt uint64 `gorm:"autoCreateTime:milli" json:"created_at"`
+	UpdatedAt uint64 `gorm:"autoUpdateTime:milli" json:"updated_at"`
+	Environment constants.Environment `json:"-"`
+	MarketplaceSlug string `json:"marketplace_slug"`
+	Marketplace *Marketplace  `gorm:"foreignKey:MarketplaceSlug;references:Slug" json:"-"`
+	Permissions Permissions `json:"permissions"`
 }
 
 func (k *Key) BeforeCreate(tx *gorm.DB) error {

internal/domain/models/marketplace.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"fmt"
+	"regexp"
 
 	"gorm.io/gorm"
 )
@@ -15,11 +16,19 @@ type Marketplace struct {
 }
 
 func (m *Marketplace) BeforeCreate(tx *gorm.DB) error {
-	if m.Slug == "" {
- return fmt.Errorf("slug is required")
+	return m.Validate()
+}
+
+func (m *Marketplace) Validate() error {
+	if len(m.Slug) == 0 || len(m.Slug) > 25 {
+ return fmt.Errorf("slug must be between 1 and 25 characters long")
 	}
-	if m.Name == "" {
- return fmt.Errorf("name is required")
+	if !regexp.MustCompile(`^[a-zA-Z0-9-]+$`).MatchString(m.Slug) {
+ return fmt.Errorf("slug must contain only letters, numbers, and hyphens")
+	}
+
+	if len(m.Name) == 0 || len(m.Name) > 50 {
+ return fmt.Errorf("name must be between 1 and 50 characters long")
 	}
 	return nil
 }

internal/domain/repository/private.go

@@ -1,42 +1,30 @@
 package repository
 
 import (
+	"reverse-watch/internal/domain/dto"
 	"reverse-watch/internal/domain/models"
 )
 
-type UpdateKeyOptions struct {
-	Permissions *models.Permissions
-}
-
-type KeyListOptions struct {
-	MarketplaceSlug *string
-}
-
 type KeyRepository interface {
 	Create(key *models.Key) error
 	Read(id string) (*models.Key, error)
-	Update(id string, opts *UpdateKeyOptions) error
+	Update(id string, opts *dto.KeyUpdateOptions) error
 	Delete(id string) error
-	List(opts *KeyListOptions) ([]*models.Key, error)
+	List(opts *dto.KeyListOptions) ([]*models.Key, error)
 }
 
 type MarketplaceRepository interface {
 	Create(marketplace *models.Marketplace) error
 	Read(slug string) (*models.Marketplace, error)
-	Update(slug string, fields map[string]interface{}) error
+	Update(slug string, opts *dto.MarketplaceUpdateOptions) error
 	Delete(slug string) error
 }
 
-type AdminAuditListOptions struct {
-	TargetActions []models.TargetAction
-	TargetResource *models.Snowflake
-}
-
 type AdminAuditRepository interface {
 	Create(audit *models.AdminAudit) error
 	Read(id models.Snowflake) (*models.AdminAudit, error)
 	Delete(id models.Snowflake) error
-	List(opts *AdminAuditListOptions) ([]*models.AdminAudit, error)
+	List(opts *dto.AdminAuditListOptions) ([]*models.AdminAudit, error)
 }
 
 type PrivateRepository interface {

internal/domain/repository/public.go

@@ -1,24 +1,18 @@
 package repository
 
 import (
+	"reverse-watch/internal/domain/dto"
 	"reverse-watch/internal/domain/models"
 )
 
-type ReversalListOptions struct {
-	SteamID *models.SteamID
-	MarketplaceSlug *string
-	Cursor *models.Cursor
-	Limit *uint
-}
-
 type ReversalRepository interface {
 	Create(reversal *models.Reversal) error
 	BulkCreate(reversals []*models.Reversal) error
 	Read(id models.Snowflake) (*models.Reversal, error)
 	Update(id models.Snowflake, fields map[string]interface{}) error
 	Delete(id models.Snowflake) error
 	Expunge(id models.Snowflake) error
-	List(opts *ReversalListOptions) ([]*models.Reversal, error)
+	List(opts *dto.ReversalListOptions) ([]*models.Reversal, error)
 }
 
 type PublicRepository interface {