web: use multi-stage building for the container file

.drone.yml

@@ -1,157 +0,0 @@
----
-kind: pipeline
-type: docker
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-  - name: api
-    image: plugins/docker
-    settings:
-      registry: registry.itzana.me
-      repo: registry.itzana.me/strafesnet/maptest-api
-      tags:
-        - ${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
-        - ${DRONE_BRANCH}
-      username:
-        from_secret: REGISTRY_USER
-      password:
-        from_secret: REGISTRY_PASS
-      dockerfile: Containerfile
-      context: .
-    when:
-      branch:
-        - master
-        - staging
-      event:
-        - push
-
-  - name: frontend
-    image: plugins/docker
-    settings:
-      registry: registry.itzana.me
-      repo: registry.itzana.me/strafesnet/maptest-frontend
-      tags:
-        - ${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
-        - ${DRONE_BRANCH}
-      username:
-        from_secret: REGISTRY_USER
-      password:
-        from_secret: REGISTRY_PASS
-      dockerfile: web/Containerfile
-      context: web
-    when:
-      branch:
-        - master
-        - staging
-      event:
-        - push
-
-  - name: validator
-    image: plugins/docker
-    settings:
-      registry: registry.itzana.me
-      repo: registry.itzana.me/strafesnet/maptest-validator
-      tags:
-        - ${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
-        - ${DRONE_BRANCH}
-      username:
-        from_secret: REGISTRY_USER
-      password:
-        from_secret: REGISTRY_PASS
-      dockerfile: validation/Containerfile
-      context: validation
-    when:
-      branch:
-        - master
-        - staging
-      event:
-        - push
-
-  - name: deploy
-    image: argoproj/argocd:latest
-    commands:
-      - argocd login --grpc-web cd.stricity.com --username $USERNAME --password $PASSWORD
-      - argocd app --grpc-web set ${DRONE_BRANCH}-maps-service --kustomize-image registry.itzana.me/strafesnet/maptest-api:${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
-      - argocd app --grpc-web set ${DRONE_BRANCH}-maps-service --kustomize-image registry.itzana.me/strafesnet/maptest-frontend:${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
-      - argocd app --grpc-web set ${DRONE_BRANCH}-maps-service --kustomize-image registry.itzana.me/strafesnet/maptest-validator:${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
-    environment:
-      USERNAME:
-        from_secret: ARGO_USER
-      PASSWORD:
-        from_secret: ARGO_PASS
-    depends_on:
-      - api
-      - frontend
-      - validator
-    when:
-      branch:
-        - master
-        - staging
-      event:
-        - push
-
-# pr dry run
-  - name: api-pr
-    image: plugins/docker
-    settings:
-      registry: registry.itzana.me
-      repo: registry.itzana.me/strafesnet/maptest-validator
-      tags:
-        - ${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
-        - ${DRONE_BRANCH}
-      dockerfile: Containerfile
-      context: .
-      dry_run: true
-    when:
-      event:
-        - pull_request
-
-  - name: frontend-pr
-    image: plugins/docker
-    settings:
-      registry: registry.itzana.me
-      repo: registry.itzana.me/strafesnet/maptest-validator
-      tags:
-        - ${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
-        - ${DRONE_BRANCH}
-      dockerfile: web/Containerfile
-      context: web
-      dry_run: true
-    when:
-      event:
-      - pull_request
-
-  - name: validator-pr
-    image: plugins/docker
-    settings:
-      registry: registry.itzana.me
-      repo: registry.itzana.me/strafesnet/maptest-validator
-      tags:
-        - ${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
-        - ${DRONE_BRANCH}
-      dockerfile: validation/Containerfile
-      context: validation
-      dry_run: true
-    when:
-      event:
-        - pull_request
-
-  - name: build-pr
-    image: alpine
-    commands:
-      - echo "Success!"
-    depends_on:
-      - api-pr
-      - frontend-pr
-      - validator-pr
-    when:
-      event:
-        - pull_request
----
-kind: signature
-hmac: 11e6d7f1eb839d3798fdcb642ca5523c011bd14c1f3a0343a9c3106bab9ef142
-
-...

.gitignore

@@ -1,2 +1 @@
 .idea
-/target

Cargo.toml

@@ -1,6 +0,0 @@
-[workspace]
-members = [
-	"validation",
-	"validation/api",
-]
-resolver = "2"

Containerfile

@@ -1,5 +1,5 @@
 # Stage 1: Build
-FROM registry.itzana.me/docker-proxy/golang:1.24 AS builder
+FROM docker.io/golang:1.23 AS builder
 
 # Set the working directory in the container
 WORKDIR /app
@@ -7,6 +7,9 @@ WORKDIR /app
 # Copy go.mod and go.sum files
 COPY go.mod go.sum ./
 
+# Download dependencies
+RUN --mount=type=secret,id=netrc,dst=/root/.netrc go mod download
+
 # Copy the entire project
 COPY . .
 
@@ -14,7 +17,7 @@ COPY . .
 RUN CGO_ENABLED=0 GOOS=linux go build -o service ./cmd/maps-service/service.go
 
 # Stage 2: Run
-FROM registry.itzana.me/docker-proxy/alpine:3.21
+FROM alpine
 
 # Set up a non-root user for security
 RUN addgroup -S appgroup && adduser -S appuser -G appgroup

Makefile

@@ -1,12 +0,0 @@
-submissions:
-	DOCKER_BUILDKIT=1 docker build . -f Containerfile -t maps-service-submissions
-
-web:
-	docker build web -f web/Containerfile -t maps-service-web
-
-validation:
-	docker build validation -f validation/Containerfile -t maps-service-validation
-
-all: submissions web validation
-
-.PHONY: submissions web validation

README.md

@@ -26,13 +26,6 @@ Prerequisite: golang installed
 
 Prerequisite: bun installed
 
-The environment variables `API_HOST` and `AUTH_HOST` will need to be set for the middleware.
-Example `.env` in web's root:
-```
-API_HOST="http://localhost:8082/"
-AUTH_HOST="http://localhost:8083/"
-```
-
 1. `cd web`
 2. `bun install`
 
@@ -50,12 +43,6 @@ Prerequisite: rust installed
 1. `cd validation`
 2. `cargo run --release`
 
-Environment Variables:
-- ROBLOX_GROUP_ID
-- RBXCOOKIE
-- API_HOST_INTERNAL
-- NATS_HOST
-
 #### License
 
 <sup>

compose.yaml

@@ -3,25 +3,32 @@ networks:
   maps-service-network:
     driver: bridge
 
+secrets:
+  netrc:
+    file: /home/quat/.netrc
+
 services:
   nats:
     image: docker.io/nats:latest
     container_name: nats
-    command: ["-js"] #"-DVV"
+    command: ["-js"]
     networks:
       - maps-service-network
+    ports:
+      - "4222:4222"
 
-  submissions:
+  maps-service:
-    image:
+    build:
-      maps-service-submissions
+      secrets:
-    container_name: submissions
+        - netrc
+      context: .
+      dockerfile: Containerfile
+    container_name: maps-service
     command: [
       # debug
       "--debug","serve",
       # http service port
-      "--port","8082",
+      "--port","8081",
-      # internal http endpoints
-      "--port-internal","8083",
       # postgres
       "--pg-host","10.0.0.29",
       "--pg-port","5432",
@@ -30,100 +37,38 @@ services:
       "--pg-password","happypostgresuser",
       # other hosts
       "--nats-host","nats:4222",
-      "--auth-rpc-host","authrpc:8081",
+      "--auth-rpc-host","localhost:8090"
-      "--data-rpc-host","dataservice:9000",
     ]
-    env_file:
-      - ../auth-compose/strafesnet_staging.env
     depends_on:
-      - authrpc
       - nats
     networks:
       - maps-service-network
     ports:
-      - "8082:8082"
+      - "8081:8081"
 
   web:
-    image:
+    build:
-      maps-service-web
+      context: web
+      dockerfile: Containerfile
     networks:
       - maps-service-network
     ports:
       - "3000:3000"
-    environment:
-      - API_HOST=http://submissions:8082/v1
-      - AUTH_HOST=http://localhost:8080/
 
   validation:
-    image:
+    build:
-      maps-service-validation
+      context: validation
+      dockerfile: Containerfile
     container_name: validation
-    env_file:
-      - ../auth-compose/strafesnet_staging.env
     environment:
-      - ROBLOX_GROUP_ID=17032139 # "None" is special case string value
+      - RBXCOOKIE=RBXCOOKIE
-      - API_HOST_INTERNAL=http://submissions:8083/v1
+      - API_HOST=http://localhost:8081
       - NATS_HOST=nats:4222
+      - DATA_HOST=http://localhost:9000
     depends_on:
       - nats
-      # note: this races the submissions which creates a nats stream
+      # note: this races the maps-service which creates a nats stream
       # the validation will panic if the nats stream is not created
-      - submissions
+      - maps-service
-      - dataservice
     networks:
       - maps-service-network
-
-  dataservice:
-    image: registry.itzana.me/strafesnet/data-service:master
-    container_name: dataservice
-    environment:
-      - DEBUG=true
-      - PG_HOST=10.0.0.29
-      - PG_PORT=5432
-      - PG_USER=quat
-      - PG_DB=data
-      - PG_PASS=happypostgresuser
-    networks:
-      - maps-service-network
-
-  authredis:
-    image: docker.io/redis:latest
-    container_name: authredis
-    volumes:
-      - redis-data:/data
-    command: ["redis-server", "--appendonly", "yes"]
-    networks:
-      - maps-service-network
-
-  authrpc:
-    image: registry.itzana.me/strafesnet/auth-service:staging
-    container_name: authrpc
-    command: ["serve", "rpc"]
-    environment:
-      - REDIS_ADDR=authredis:6379
-      - RBX_GROUP_ID=17032139
-    env_file:
-      - ../auth-compose/auth-service.env
-    depends_on:
-      - authredis
-    networks:
-      - maps-service-network
-    logging:
-      driver: "none"
-
-  auth-web:
-    image: registry.itzana.me/strafesnet/auth-service:staging
-    command: ["serve", "web"]
-    environment:
-      - REDIS_ADDR=authredis:6379
-    env_file:
-      - ../auth-compose/auth-service.env
-    depends_on:
-      - authredis
-    networks:
-      - maps-service-network
-    ports:
-      - "8080:8080"
-
-volumes:
-  redis-data:

go.mod

@@ -5,7 +5,7 @@ go 1.22
 toolchain go1.23.3
 
 require (
-	git.itzana.me/strafesnet/go-grpc v0.0.0-20250724030029-845bea991815
+	git.itzana.me/strafesnet/go-grpc v0.0.0-20241129081229-9e166b3d11f7
 	git.itzana.me/strafesnet/utils v0.0.0-20220716194944-d8ca164052f9
 	github.com/dchest/siphash v1.2.3
 	github.com/go-faster/errors v0.7.1
@@ -53,7 +53,7 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc // indirect
 	golang.org/x/net v0.25.0 // indirect

go.sum

@@ -1,7 +1,7 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-git.itzana.me/strafesnet/go-grpc v0.0.0-20250724030029-845bea991815 h1:hkuOnehphRXUq/2z2UYgoqTq5MJj1GsWfshyc7bXda8=
+git.itzana.me/strafesnet/go-grpc v0.0.0-20241129081229-9e166b3d11f7 h1:5XzWd3ZZjSw1M60IfHuILty2vRPBYiqM0FZ+E7uHCi8=
-git.itzana.me/strafesnet/go-grpc v0.0.0-20250724030029-845bea991815/go.mod h1:X7XTRUScRkBWq8q8bplbeso105RPDlnY7J6Wy1IwBMs=
+git.itzana.me/strafesnet/go-grpc v0.0.0-20241129081229-9e166b3d11f7/go.mod h1:X7XTRUScRkBWq8q8bplbeso105RPDlnY7J6Wy1IwBMs=
 git.itzana.me/strafesnet/utils v0.0.0-20220716194944-d8ca164052f9 h1:7lU6jyR7S7Rhh1dnUp7GyIRHUTBXZagw8F4n4hOyxLw=
 git.itzana.me/strafesnet/utils v0.0.0-20220716194944-d8ca164052f9/go.mod h1:uyYerSieEt4v0MJCdPLppG0LtJ4Yj035vuTetWGsxjY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

pkg/api/oas_operations_gen.go

@@ -6,60 +6,26 @@ package api
 type OperationName = string
 
 const (
-	ActionMapfixAcceptedOperation                   OperationName = "ActionMapfixAccepted"
+	ActionSubmissionPublishOperation         OperationName = "ActionSubmissionPublish"
-	ActionMapfixRejectOperation                     OperationName = "ActionMapfixReject"
+	ActionSubmissionRejectOperation          OperationName = "ActionSubmissionReject"
-	ActionMapfixRequestChangesOperation             OperationName = "ActionMapfixRequestChanges"
+	ActionSubmissionRequestChangesOperation  OperationName = "ActionSubmissionRequestChanges"
-	ActionMapfixResetSubmittingOperation            OperationName = "ActionMapfixResetSubmitting"
+	ActionSubmissionRevokeOperation          OperationName = "ActionSubmissionRevoke"
-	ActionMapfixRetryValidateOperation              OperationName = "ActionMapfixRetryValidate"
+	ActionSubmissionSubmitOperation          OperationName = "ActionSubmissionSubmit"
-	ActionMapfixRevokeOperation                     OperationName = "ActionMapfixRevoke"
+	ActionSubmissionTriggerPublishOperation  OperationName = "ActionSubmissionTriggerPublish"
-	ActionMapfixTriggerSubmitOperation              OperationName = "ActionMapfixTriggerSubmit"
+	ActionSubmissionTriggerValidateOperation OperationName = "ActionSubmissionTriggerValidate"
-	ActionMapfixTriggerSubmitUncheckedOperation     OperationName = "ActionMapfixTriggerSubmitUnchecked"
+	ActionSubmissionValidateOperation        OperationName = "ActionSubmissionValidate"
-	ActionMapfixTriggerUploadOperation              OperationName = "ActionMapfixTriggerUpload"
+	CreateScriptOperation                    OperationName = "CreateScript"
-	ActionMapfixTriggerValidateOperation            OperationName = "ActionMapfixTriggerValidate"
+	CreateScriptPolicyOperation              OperationName = "CreateScriptPolicy"
-	ActionMapfixValidatedOperation                  OperationName = "ActionMapfixValidated"
+	CreateSubmissionOperation                OperationName = "CreateSubmission"
-	ActionSubmissionAcceptedOperation               OperationName = "ActionSubmissionAccepted"
+	DeleteScriptOperation                    OperationName = "DeleteScript"
-	ActionSubmissionRejectOperation                 OperationName = "ActionSubmissionReject"
+	DeleteScriptPolicyOperation              OperationName = "DeleteScriptPolicy"
-	ActionSubmissionRequestChangesOperation         OperationName = "ActionSubmissionRequestChanges"
+	GetScriptOperation                       OperationName = "GetScript"
-	ActionSubmissionResetSubmittingOperation        OperationName = "ActionSubmissionResetSubmitting"
+	GetScriptPolicyOperation                 OperationName = "GetScriptPolicy"
-	ActionSubmissionRetryValidateOperation          OperationName = "ActionSubmissionRetryValidate"
+	GetScriptPolicyFromHashOperation         OperationName = "GetScriptPolicyFromHash"
-	ActionSubmissionRevokeOperation                 OperationName = "ActionSubmissionRevoke"
+	GetSubmissionOperation                   OperationName = "GetSubmission"
-	ActionSubmissionTriggerSubmitOperation          OperationName = "ActionSubmissionTriggerSubmit"
+	ListSubmissionsOperation                 OperationName = "ListSubmissions"
-	ActionSubmissionTriggerSubmitUncheckedOperation OperationName = "ActionSubmissionTriggerSubmitUnchecked"
+	SetSubmissionCompletedOperation          OperationName = "SetSubmissionCompleted"
-	ActionSubmissionTriggerUploadOperation          OperationName = "ActionSubmissionTriggerUpload"
+	UpdateScriptOperation                    OperationName = "UpdateScript"
-	ActionSubmissionTriggerValidateOperation        OperationName = "ActionSubmissionTriggerValidate"
+	UpdateScriptPolicyOperation              OperationName = "UpdateScriptPolicy"
-	ActionSubmissionValidatedOperation              OperationName = "ActionSubmissionValidated"
+	UpdateSubmissionModelOperation           OperationName = "UpdateSubmissionModel"
-	CreateMapfixOperation                           OperationName = "CreateMapfix"
-	CreateMapfixAuditCommentOperation               OperationName = "CreateMapfixAuditComment"
-	CreateScriptOperation                           OperationName = "CreateScript"
-	CreateScriptPolicyOperation                     OperationName = "CreateScriptPolicy"
-	CreateSubmissionOperation                       OperationName = "CreateSubmission"
-	CreateSubmissionAdminOperation                  OperationName = "CreateSubmissionAdmin"
-	CreateSubmissionAuditCommentOperation           OperationName = "CreateSubmissionAuditComment"
-	DeleteScriptOperation                           OperationName = "DeleteScript"
-	DeleteScriptPolicyOperation                     OperationName = "DeleteScriptPolicy"
-	DownloadMapAssetOperation                       OperationName = "DownloadMapAsset"
-	GetMapOperation                                 OperationName = "GetMap"
-	GetMapfixOperation                              OperationName = "GetMapfix"
-	GetOperationOperation                           OperationName = "GetOperation"
-	GetScriptOperation                              OperationName = "GetScript"
-	GetScriptPolicyOperation                        OperationName = "GetScriptPolicy"
-	GetSubmissionOperation                          OperationName = "GetSubmission"
-	ListMapfixAuditEventsOperation                  OperationName = "ListMapfixAuditEvents"
-	ListMapfixesOperation                           OperationName = "ListMapfixes"
-	ListMapsOperation                               OperationName = "ListMaps"
-	ListScriptPolicyOperation                       OperationName = "ListScriptPolicy"
-	ListScriptsOperation                            OperationName = "ListScripts"
-	ListSubmissionAuditEventsOperation              OperationName = "ListSubmissionAuditEvents"
-	ListSubmissionsOperation                        OperationName = "ListSubmissions"
-	MigrateMapsOperation                            OperationName = "MigrateMaps"
-	ReleaseSubmissionsOperation                     OperationName = "ReleaseSubmissions"
-	SessionRolesOperation                           OperationName = "SessionRoles"
-	SessionUserOperation                            OperationName = "SessionUser"
-	SessionValidateOperation                        OperationName = "SessionValidate"
-	SetMapfixCompletedOperation                     OperationName = "SetMapfixCompleted"
-	SetSubmissionCompletedOperation                 OperationName = "SetSubmissionCompleted"
-	UpdateMapfixModelOperation                      OperationName = "UpdateMapfixModel"
-	UpdateScriptOperation                           OperationName = "UpdateScript"
-	UpdateScriptPolicyOperation                     OperationName = "UpdateScriptPolicy"
-	UpdateSubmissionModelOperation                  OperationName = "UpdateSubmissionModel"
 )

pkg/api/oas_request_decoders_gen.go

@@ -3,123 +3,18 @@
 package api
 
 import (
-	"fmt"
 	"io"
 	"mime"
 	"net/http"
 
 	"github.com/go-faster/errors"
 	"github.com/go-faster/jx"
+	"go.uber.org/multierr"
 
 	"github.com/ogen-go/ogen/ogenerrors"
 	"github.com/ogen-go/ogen/validate"
 )
 
-func (s *Server) decodeCreateMapfixRequest(r *http.Request) (
-	req *MapfixTriggerCreate,
-	close func() error,
-	rerr error,
-) {
-	var closers []func() error
-	close = func() error {
-		var merr error
-		// Close in reverse order, to match defer behavior.
-		for i := len(closers) - 1; i >= 0; i-- {
-			c := closers[i]
-			merr = errors.Join(merr, c())
-		}
-		return merr
-	}
-	defer func() {
-		if rerr != nil {
-			rerr = errors.Join(rerr, close())
-		}
-	}()
-	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
-	if err != nil {
-		return req, close, errors.Wrap(err, "parse media type")
-	}
-	switch {
-	case ct == "application/json":
-		if r.ContentLength == 0 {
-			return req, close, validate.ErrBodyRequired
-		}
-		buf, err := io.ReadAll(r.Body)
-		if err != nil {
-			return req, close, err
-		}
-
-		if len(buf) == 0 {
-			return req, close, validate.ErrBodyRequired
-		}
-
-		d := jx.DecodeBytes(buf)
-
-		var request MapfixTriggerCreate
-		if err := func() error {
-			if err := request.Decode(d); err != nil {
-				return err
-			}
-			if err := d.Skip(); err != io.EOF {
-				return errors.New("unexpected trailing data")
-			}
-			return nil
-		}(); err != nil {
-			err = &ogenerrors.DecodeBodyError{
-				ContentType: ct,
-				Body:        buf,
-				Err:         err,
-			}
-			return req, close, err
-		}
-		if err := func() error {
-			if err := request.Validate(); err != nil {
-				return err
-			}
-			return nil
-		}(); err != nil {
-			return req, close, errors.Wrap(err, "validate")
-		}
-		return &request, close, nil
-	default:
-		return req, close, validate.InvalidContentType(ct)
-	}
-}
-
-func (s *Server) decodeCreateMapfixAuditCommentRequest(r *http.Request) (
-	req CreateMapfixAuditCommentReq,
-	close func() error,
-	rerr error,
-) {
-	var closers []func() error
-	close = func() error {
-		var merr error
-		// Close in reverse order, to match defer behavior.
-		for i := len(closers) - 1; i >= 0; i-- {
-			c := closers[i]
-			merr = errors.Join(merr, c())
-		}
-		return merr
-	}
-	defer func() {
-		if rerr != nil {
-			rerr = errors.Join(rerr, close())
-		}
-	}()
-	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
-	if err != nil {
-		return req, close, errors.Wrap(err, "parse media type")
-	}
-	switch {
-	case ct == "text/plain":
-		reader := r.Body
-		request := CreateMapfixAuditCommentReq{Data: reader}
-		return request, close, nil
-	default:
-		return req, close, validate.InvalidContentType(ct)
-	}
-}
-
 func (s *Server) decodeCreateScriptRequest(r *http.Request) (
 	req *ScriptCreate,
 	close func() error,
@@ -131,13 +26,13 @@ func (s *Server) decodeCreateScriptRequest(r *http.Request) (
 		// Close in reverse order, to match defer behavior.
 		for i := len(closers) - 1; i >= 0; i-- {
 			c := closers[i]
-			merr = errors.Join(merr, c())
+			merr = multierr.Append(merr, c())
 		}
 		return merr
 	}
 	defer func() {
 		if rerr != nil {
-			rerr = errors.Join(rerr, close())
+			rerr = multierr.Append(rerr, close())
 		}
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
@@ -202,13 +97,13 @@ func (s *Server) decodeCreateScriptPolicyRequest(r *http.Request) (
 		// Close in reverse order, to match defer behavior.
 		for i := len(closers) - 1; i >= 0; i-- {
 			c := closers[i]
-			merr = errors.Join(merr, c())
+			merr = multierr.Append(merr, c())
 		}
 		return merr
 	}
 	defer func() {
 		if rerr != nil {
-			rerr = errors.Join(rerr, close())
+			rerr = multierr.Append(rerr, close())
 		}
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
@@ -248,14 +143,6 @@ func (s *Server) decodeCreateScriptPolicyRequest(r *http.Request) (
 			}
 			return req, close, err
 		}
-		if err := func() error {
-			if err := request.Validate(); err != nil {
-				return err
-			}
-			return nil
-		}(); err != nil {
-			return req, close, errors.Wrap(err, "validate")
-		}
 		return &request, close, nil
 	default:
 		return req, close, validate.InvalidContentType(ct)
@@ -263,7 +150,7 @@ func (s *Server) decodeCreateScriptPolicyRequest(r *http.Request) (
 }
 
 func (s *Server) decodeCreateSubmissionRequest(r *http.Request) (
-	req *SubmissionTriggerCreate,
+	req *SubmissionCreate,
 	close func() error,
 	rerr error,
 ) {
@@ -273,13 +160,13 @@ func (s *Server) decodeCreateSubmissionRequest(r *http.Request) (
 		// Close in reverse order, to match defer behavior.
 		for i := len(closers) - 1; i >= 0; i-- {
 			c := closers[i]
-			merr = errors.Join(merr, c())
+			merr = multierr.Append(merr, c())
 		}
 		return merr
 	}
 	defer func() {
 		if rerr != nil {
-			rerr = errors.Join(rerr, close())
+			rerr = multierr.Append(rerr, close())
 		}
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
@@ -302,7 +189,7 @@ func (s *Server) decodeCreateSubmissionRequest(r *http.Request) (
 
 		d := jx.DecodeBytes(buf)
 
-		var request SubmissionTriggerCreate
+		var request SubmissionCreate
 		if err := func() error {
 			if err := request.Decode(d); err != nil {
 				return err
@@ -333,215 +220,6 @@ func (s *Server) decodeCreateSubmissionRequest(r *http.Request) (
 	}
 }
 
-func (s *Server) decodeCreateSubmissionAdminRequest(r *http.Request) (
-	req *SubmissionTriggerCreate,
-	close func() error,
-	rerr error,
-) {
-	var closers []func() error
-	close = func() error {
-		var merr error
-		// Close in reverse order, to match defer behavior.
-		for i := len(closers) - 1; i >= 0; i-- {
-			c := closers[i]
-			merr = errors.Join(merr, c())
-		}
-		return merr
-	}
-	defer func() {
-		if rerr != nil {
-			rerr = errors.Join(rerr, close())
-		}
-	}()
-	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
-	if err != nil {
-		return req, close, errors.Wrap(err, "parse media type")
-	}
-	switch {
-	case ct == "application/json":
-		if r.ContentLength == 0 {
-			return req, close, validate.ErrBodyRequired
-		}
-		buf, err := io.ReadAll(r.Body)
-		if err != nil {
-			return req, close, err
-		}
-
-		if len(buf) == 0 {
-			return req, close, validate.ErrBodyRequired
-		}
-
-		d := jx.DecodeBytes(buf)
-
-		var request SubmissionTriggerCreate
-		if err := func() error {
-			if err := request.Decode(d); err != nil {
-				return err
-			}
-			if err := d.Skip(); err != io.EOF {
-				return errors.New("unexpected trailing data")
-			}
-			return nil
-		}(); err != nil {
-			err = &ogenerrors.DecodeBodyError{
-				ContentType: ct,
-				Body:        buf,
-				Err:         err,
-			}
-			return req, close, err
-		}
-		if err := func() error {
-			if err := request.Validate(); err != nil {
-				return err
-			}
-			return nil
-		}(); err != nil {
-			return req, close, errors.Wrap(err, "validate")
-		}
-		return &request, close, nil
-	default:
-		return req, close, validate.InvalidContentType(ct)
-	}
-}
-
-func (s *Server) decodeCreateSubmissionAuditCommentRequest(r *http.Request) (
-	req CreateSubmissionAuditCommentReq,
-	close func() error,
-	rerr error,
-) {
-	var closers []func() error
-	close = func() error {
-		var merr error
-		// Close in reverse order, to match defer behavior.
-		for i := len(closers) - 1; i >= 0; i-- {
-			c := closers[i]
-			merr = errors.Join(merr, c())
-		}
-		return merr
-	}
-	defer func() {
-		if rerr != nil {
-			rerr = errors.Join(rerr, close())
-		}
-	}()
-	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
-	if err != nil {
-		return req, close, errors.Wrap(err, "parse media type")
-	}
-	switch {
-	case ct == "text/plain":
-		reader := r.Body
-		request := CreateSubmissionAuditCommentReq{Data: reader}
-		return request, close, nil
-	default:
-		return req, close, validate.InvalidContentType(ct)
-	}
-}
-
-func (s *Server) decodeReleaseSubmissionsRequest(r *http.Request) (
-	req []ReleaseInfo,
-	close func() error,
-	rerr error,
-) {
-	var closers []func() error
-	close = func() error {
-		var merr error
-		// Close in reverse order, to match defer behavior.
-		for i := len(closers) - 1; i >= 0; i-- {
-			c := closers[i]
-			merr = errors.Join(merr, c())
-		}
-		return merr
-	}
-	defer func() {
-		if rerr != nil {
-			rerr = errors.Join(rerr, close())
-		}
-	}()
-	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
-	if err != nil {
-		return req, close, errors.Wrap(err, "parse media type")
-	}
-	switch {
-	case ct == "application/json":
-		if r.ContentLength == 0 {
-			return req, close, validate.ErrBodyRequired
-		}
-		buf, err := io.ReadAll(r.Body)
-		if err != nil {
-			return req, close, err
-		}
-
-		if len(buf) == 0 {
-			return req, close, validate.ErrBodyRequired
-		}
-
-		d := jx.DecodeBytes(buf)
-
-		var request []ReleaseInfo
-		if err := func() error {
-			request = make([]ReleaseInfo, 0)
-			if err := d.Arr(func(d *jx.Decoder) error {
-				var elem ReleaseInfo
-				if err := elem.Decode(d); err != nil {
-					return err
-				}
-				request = append(request, elem)
-				return nil
-			}); err != nil {
-				return err
-			}
-			if err := d.Skip(); err != io.EOF {
-				return errors.New("unexpected trailing data")
-			}
-			return nil
-		}(); err != nil {
-			err = &ogenerrors.DecodeBodyError{
-				ContentType: ct,
-				Body:        buf,
-				Err:         err,
-			}
-			return req, close, err
-		}
-		if err := func() error {
-			if request == nil {
-				return errors.New("nil is invalid value")
-			}
-			if err := (validate.Array{
-				MinLength:    1,
-				MinLengthSet: true,
-				MaxLength:    255,
-				MaxLengthSet: true,
-			}).ValidateLength(len(request)); err != nil {
-				return errors.Wrap(err, "array")
-			}
-			var failures []validate.FieldError
-			for i, elem := range request {
-				if err := func() error {
-					if err := elem.Validate(); err != nil {
-						return err
-					}
-					return nil
-				}(); err != nil {
-					failures = append(failures, validate.FieldError{
-						Name:  fmt.Sprintf("[%d]", i),
-						Error: err,
-					})
-				}
-			}
-			if len(failures) > 0 {
-				return &validate.Error{Fields: failures}
-			}
-			return nil
-		}(); err != nil {
-			return req, close, errors.Wrap(err, "validate")
-		}
-		return request, close, nil
-	default:
-		return req, close, validate.InvalidContentType(ct)
-	}
-}
-
 func (s *Server) decodeUpdateScriptRequest(r *http.Request) (
 	req *ScriptUpdate,
 	close func() error,
@@ -553,13 +231,13 @@ func (s *Server) decodeUpdateScriptRequest(r *http.Request) (
 		// Close in reverse order, to match defer behavior.
 		for i := len(closers) - 1; i >= 0; i-- {
 			c := closers[i]
-			merr = errors.Join(merr, c())
+			merr = multierr.Append(merr, c())
 		}
 		return merr
 	}
 	defer func() {
 		if rerr != nil {
-			rerr = errors.Join(rerr, close())
+			rerr = multierr.Append(rerr, close())
 		}
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
@@ -624,13 +302,13 @@ func (s *Server) decodeUpdateScriptPolicyRequest(r *http.Request) (
 		// Close in reverse order, to match defer behavior.
 		for i := len(closers) - 1; i >= 0; i-- {
 			c := closers[i]
-			merr = errors.Join(merr, c())
+			merr = multierr.Append(merr, c())
 		}
 		return merr
 	}
 	defer func() {
 		if rerr != nil {
-			rerr = errors.Join(rerr, close())
+			rerr = multierr.Append(rerr, close())
 		}
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
@@ -670,14 +348,6 @@ func (s *Server) decodeUpdateScriptPolicyRequest(r *http.Request) (
 			}
 			return req, close, err
 		}
-		if err := func() error {
-			if err := request.Validate(); err != nil {
-				return err
-			}
-			return nil
-		}(); err != nil {
-			return req, close, errors.Wrap(err, "validate")
-		}
 		return &request, close, nil
 	default:
 		return req, close, validate.InvalidContentType(ct)

pkg/api/oas_request_encoders_gen.go

@@ -11,30 +11,6 @@ import (
 	ht "github.com/ogen-go/ogen/http"
 )
 
-func encodeCreateMapfixRequest(
-	req *MapfixTriggerCreate,
-	r *http.Request,
-) error {
-	const contentType = "application/json"
-	e := new(jx.Encoder)
-	{
-		req.Encode(e)
-	}
-	encoded := e.Bytes()
-	ht.SetBody(r, bytes.NewReader(encoded), contentType)
-	return nil
-}
-
-func encodeCreateMapfixAuditCommentRequest(
-	req CreateMapfixAuditCommentReq,
-	r *http.Request,
-) error {
-	const contentType = "text/plain"
-	body := req
-	ht.SetBody(r, body, contentType)
-	return nil
-}
-
 func encodeCreateScriptRequest(
 	req *ScriptCreate,
 	r *http.Request,
@@ -64,7 +40,7 @@ func encodeCreateScriptPolicyRequest(
 }
 
 func encodeCreateSubmissionRequest(
-	req *SubmissionTriggerCreate,
+	req *SubmissionCreate,
 	r *http.Request,
 ) error {
 	const contentType = "application/json"
@@ -77,48 +53,6 @@ func encodeCreateSubmissionRequest(
 	return nil
 }
 
-func encodeCreateSubmissionAdminRequest(
-	req *SubmissionTriggerCreate,
-	r *http.Request,
-) error {
-	const contentType = "application/json"
-	e := new(jx.Encoder)
-	{
-		req.Encode(e)
-	}
-	encoded := e.Bytes()
-	ht.SetBody(r, bytes.NewReader(encoded), contentType)
-	return nil
-}
-
-func encodeCreateSubmissionAuditCommentRequest(
-	req CreateSubmissionAuditCommentReq,
-	r *http.Request,
-) error {
-	const contentType = "text/plain"
-	body := req
-	ht.SetBody(r, body, contentType)
-	return nil
-}
-
-func encodeReleaseSubmissionsRequest(
-	req []ReleaseInfo,
-	r *http.Request,
-) error {
-	const contentType = "application/json"
-	e := new(jx.Encoder)
-	{
-		e.ArrStart()
-		for _, elem := range req {
-			elem.Encode(e)
-		}
-		e.ArrEnd()
-	}
-	encoded := e.Bytes()
-	ht.SetBody(r, bytes.NewReader(encoded), contentType)
-	return nil
-}
-
 func encodeUpdateScriptRequest(
 	req *ScriptUpdate,
 	r *http.Request,

pkg/api/oas_response_encoders_gen.go

@@ -3,7 +3,6 @@
 package api
 
 import (
-	"io"
 	"net/http"
 
 	"github.com/go-faster/errors"
@@ -14,84 +13,7 @@ import (
 	ht "github.com/ogen-go/ogen/http"
 )
 
-func encodeActionMapfixAcceptedResponse(response *ActionMapfixAcceptedNoContent, w http.ResponseWriter, span trace.Span) error {
+func encodeActionSubmissionPublishResponse(response *ActionSubmissionPublishNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
-func encodeActionMapfixRejectResponse(response *ActionMapfixRejectNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
-func encodeActionMapfixRequestChangesResponse(response *ActionMapfixRequestChangesNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
-func encodeActionMapfixResetSubmittingResponse(response *ActionMapfixResetSubmittingNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
-func encodeActionMapfixRetryValidateResponse(response *ActionMapfixRetryValidateNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
-func encodeActionMapfixRevokeResponse(response *ActionMapfixRevokeNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
-func encodeActionMapfixTriggerSubmitResponse(response *ActionMapfixTriggerSubmitNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
-func encodeActionMapfixTriggerSubmitUncheckedResponse(response *ActionMapfixTriggerSubmitUncheckedNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
-func encodeActionMapfixTriggerUploadResponse(response *ActionMapfixTriggerUploadNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
-func encodeActionMapfixTriggerValidateResponse(response *ActionMapfixTriggerValidateNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
-func encodeActionMapfixValidatedResponse(response *ActionMapfixValidatedNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
-func encodeActionSubmissionAcceptedResponse(response *ActionSubmissionAcceptedNoContent, w http.ResponseWriter, span trace.Span) error {
 	w.WriteHeader(204)
 	span.SetStatus(codes.Ok, http.StatusText(204))
 
@@ -112,20 +34,6 @@ func encodeActionSubmissionRequestChangesResponse(response *ActionSubmissionRequ
 	return nil
 }
 
-func encodeActionSubmissionResetSubmittingResponse(response *ActionSubmissionResetSubmittingNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
-func encodeActionSubmissionRetryValidateResponse(response *ActionSubmissionRetryValidateNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
 func encodeActionSubmissionRevokeResponse(response *ActionSubmissionRevokeNoContent, w http.ResponseWriter, span trace.Span) error {
 	w.WriteHeader(204)
 	span.SetStatus(codes.Ok, http.StatusText(204))
@@ -133,21 +41,14 @@ func encodeActionSubmissionRevokeResponse(response *ActionSubmissionRevokeNoCont
 	return nil
 }
 
-func encodeActionSubmissionTriggerSubmitResponse(response *ActionSubmissionTriggerSubmitNoContent, w http.ResponseWriter, span trace.Span) error {
+func encodeActionSubmissionSubmitResponse(response *ActionSubmissionSubmitNoContent, w http.ResponseWriter, span trace.Span) error {
 	w.WriteHeader(204)
 	span.SetStatus(codes.Ok, http.StatusText(204))
 
 	return nil
 }
 
-func encodeActionSubmissionTriggerSubmitUncheckedResponse(response *ActionSubmissionTriggerSubmitUncheckedNoContent, w http.ResponseWriter, span trace.Span) error {
+func encodeActionSubmissionTriggerPublishResponse(response *ActionSubmissionTriggerPublishNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
-func encodeActionSubmissionTriggerUploadResponse(response *ActionSubmissionTriggerUploadNoContent, w http.ResponseWriter, span trace.Span) error {
 	w.WriteHeader(204)
 	span.SetStatus(codes.Ok, http.StatusText(204))
 
@@ -161,14 +62,14 @@ func encodeActionSubmissionTriggerValidateResponse(response *ActionSubmissionTri
 	return nil
 }
 
-func encodeActionSubmissionValidatedResponse(response *ActionSubmissionValidatedNoContent, w http.ResponseWriter, span trace.Span) error {
+func encodeActionSubmissionValidateResponse(response *ActionSubmissionValidateNoContent, w http.ResponseWriter, span trace.Span) error {
 	w.WriteHeader(204)
 	span.SetStatus(codes.Ok, http.StatusText(204))
 
 	return nil
 }
 
-func encodeCreateMapfixResponse(response *OperationID, w http.ResponseWriter, span trace.Span) error {
+func encodeCreateScriptResponse(response *ID, w http.ResponseWriter, span trace.Span) error {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(201)
 	span.SetStatus(codes.Ok, http.StatusText(201))
@@ -182,14 +83,7 @@ func encodeCreateMapfixResponse(response *OperationID, w http.ResponseWriter, sp
 	return nil
 }
 
-func encodeCreateMapfixAuditCommentResponse(response *CreateMapfixAuditCommentNoContent, w http.ResponseWriter, span trace.Span) error {
+func encodeCreateScriptPolicyResponse(response *ID, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
-func encodeCreateScriptResponse(response *ScriptID, w http.ResponseWriter, span trace.Span) error {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(201)
 	span.SetStatus(codes.Ok, http.StatusText(201))
@@ -203,7 +97,7 @@ func encodeCreateScriptResponse(response *ScriptID, w http.ResponseWriter, span
 	return nil
 }
 
-func encodeCreateScriptPolicyResponse(response *ScriptPolicyID, w http.ResponseWriter, span trace.Span) error {
+func encodeCreateSubmissionResponse(response *ID, w http.ResponseWriter, span trace.Span) error {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(201)
 	span.SetStatus(codes.Ok, http.StatusText(201))
@@ -217,41 +111,6 @@ func encodeCreateScriptPolicyResponse(response *ScriptPolicyID, w http.ResponseW
 	return nil
 }
 
-func encodeCreateSubmissionResponse(response *OperationID, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(201)
-	span.SetStatus(codes.Ok, http.StatusText(201))
-
-	e := new(jx.Encoder)
-	response.Encode(e)
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeCreateSubmissionAdminResponse(response *OperationID, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(201)
-	span.SetStatus(codes.Ok, http.StatusText(201))
-
-	e := new(jx.Encoder)
-	response.Encode(e)
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeCreateSubmissionAuditCommentResponse(response *CreateSubmissionAuditCommentNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
 func encodeDeleteScriptResponse(response *DeleteScriptNoContent, w http.ResponseWriter, span trace.Span) error {
 	w.WriteHeader(204)
 	span.SetStatus(codes.Ok, http.StatusText(204))
@@ -266,64 +125,6 @@ func encodeDeleteScriptPolicyResponse(response *DeleteScriptPolicyNoContent, w h
 	return nil
 }
 
-func encodeDownloadMapAssetResponse(response DownloadMapAssetOK, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/octet-stream")
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	writer := w
-	if closer, ok := response.Data.(io.Closer); ok {
-		defer closer.Close()
-	}
-	if _, err := io.Copy(writer, response); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeGetMapResponse(response *Map, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	e := new(jx.Encoder)
-	response.Encode(e)
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeGetMapfixResponse(response *Mapfix, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	e := new(jx.Encoder)
-	response.Encode(e)
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeGetOperationResponse(response *Operation, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	e := new(jx.Encoder)
-	response.Encode(e)
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
 func encodeGetScriptResponse(response *Script, w http.ResponseWriter, span trace.Span) error {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(200)
@@ -352,6 +153,20 @@ func encodeGetScriptPolicyResponse(response *ScriptPolicy, w http.ResponseWriter
 	return nil
 }
 
+func encodeGetScriptPolicyFromHashResponse(response *ScriptPolicy, w http.ResponseWriter, span trace.Span) error {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	w.WriteHeader(200)
+	span.SetStatus(codes.Ok, http.StatusText(200))
+
+	e := new(jx.Encoder)
+	response.Encode(e)
+	if _, err := e.WriteTo(w); err != nil {
+		return errors.Wrap(err, "write")
+	}
+
+	return nil
+}
+
 func encodeGetSubmissionResponse(response *Submission, w http.ResponseWriter, span trace.Span) error {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(200)
@@ -366,7 +181,7 @@ func encodeGetSubmissionResponse(response *Submission, w http.ResponseWriter, sp
 	return nil
 }
 
-func encodeListMapfixAuditEventsResponse(response []AuditEvent, w http.ResponseWriter, span trace.Span) error {
+func encodeListSubmissionsResponse(response []Submission, w http.ResponseWriter, span trace.Span) error {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(200)
 	span.SetStatus(codes.Ok, http.StatusText(200))
@@ -384,169 +199,6 @@ func encodeListMapfixAuditEventsResponse(response []AuditEvent, w http.ResponseW
 	return nil
 }
 
-func encodeListMapfixesResponse(response *Mapfixes, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	e := new(jx.Encoder)
-	response.Encode(e)
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeListMapsResponse(response []Map, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	e := new(jx.Encoder)
-	e.ArrStart()
-	for _, elem := range response {
-		elem.Encode(e)
-	}
-	e.ArrEnd()
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeListScriptPolicyResponse(response []ScriptPolicy, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	e := new(jx.Encoder)
-	e.ArrStart()
-	for _, elem := range response {
-		elem.Encode(e)
-	}
-	e.ArrEnd()
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeListScriptsResponse(response []Script, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	e := new(jx.Encoder)
-	e.ArrStart()
-	for _, elem := range response {
-		elem.Encode(e)
-	}
-	e.ArrEnd()
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeListSubmissionAuditEventsResponse(response []AuditEvent, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	e := new(jx.Encoder)
-	e.ArrStart()
-	for _, elem := range response {
-		elem.Encode(e)
-	}
-	e.ArrEnd()
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeListSubmissionsResponse(response *Submissions, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	e := new(jx.Encoder)
-	response.Encode(e)
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeMigrateMapsResponse(response *MigrateMapsOK, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	return nil
-}
-
-func encodeReleaseSubmissionsResponse(response *ReleaseSubmissionsCreated, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(201)
-	span.SetStatus(codes.Ok, http.StatusText(201))
-
-	return nil
-}
-
-func encodeSessionRolesResponse(response *Roles, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	e := new(jx.Encoder)
-	response.Encode(e)
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeSessionUserResponse(response *User, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	e := new(jx.Encoder)
-	response.Encode(e)
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeSessionValidateResponse(response bool, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	e := new(jx.Encoder)
-	e.Bool(response)
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeSetMapfixCompletedResponse(response *SetMapfixCompletedNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
 func encodeSetSubmissionCompletedResponse(response *SetSubmissionCompletedNoContent, w http.ResponseWriter, span trace.Span) error {
 	w.WriteHeader(204)
 	span.SetStatus(codes.Ok, http.StatusText(204))
@@ -554,13 +206,6 @@ func encodeSetSubmissionCompletedResponse(response *SetSubmissionCompletedNoCont
 	return nil
 }
 
-func encodeUpdateMapfixModelResponse(response *UpdateMapfixModelNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
 func encodeUpdateScriptResponse(response *UpdateScriptNoContent, w http.ResponseWriter, span trace.Span) error {
 	w.WriteHeader(204)
 	span.SetStatus(codes.Ok, http.StatusText(204))

pkg/api/oas_security_gen.go

@@ -33,53 +33,6 @@ func findAuthorization(h http.Header, prefix string) (string, bool) {
 	return "", false
 }
 
-var operationRolesCookieAuth = map[string][]string{
-	ActionMapfixAcceptedOperation:                   []string{},
-	ActionMapfixRejectOperation:                     []string{},
-	ActionMapfixRequestChangesOperation:             []string{},
-	ActionMapfixResetSubmittingOperation:            []string{},
-	ActionMapfixRetryValidateOperation:              []string{},
-	ActionMapfixRevokeOperation:                     []string{},
-	ActionMapfixTriggerSubmitOperation:              []string{},
-	ActionMapfixTriggerSubmitUncheckedOperation:     []string{},
-	ActionMapfixTriggerUploadOperation:              []string{},
-	ActionMapfixTriggerValidateOperation:            []string{},
-	ActionMapfixValidatedOperation:                  []string{},
-	ActionSubmissionAcceptedOperation:               []string{},
-	ActionSubmissionRejectOperation:                 []string{},
-	ActionSubmissionRequestChangesOperation:         []string{},
-	ActionSubmissionResetSubmittingOperation:        []string{},
-	ActionSubmissionRetryValidateOperation:          []string{},
-	ActionSubmissionRevokeOperation:                 []string{},
-	ActionSubmissionTriggerSubmitOperation:          []string{},
-	ActionSubmissionTriggerSubmitUncheckedOperation: []string{},
-	ActionSubmissionTriggerUploadOperation:          []string{},
-	ActionSubmissionTriggerValidateOperation:        []string{},
-	ActionSubmissionValidatedOperation:              []string{},
-	CreateMapfixOperation:                           []string{},
-	CreateMapfixAuditCommentOperation:               []string{},
-	CreateScriptOperation:                           []string{},
-	CreateScriptPolicyOperation:                     []string{},
-	CreateSubmissionOperation:                       []string{},
-	CreateSubmissionAdminOperation:                  []string{},
-	CreateSubmissionAuditCommentOperation:           []string{},
-	DeleteScriptOperation:                           []string{},
-	DeleteScriptPolicyOperation:                     []string{},
-	DownloadMapAssetOperation:                       []string{},
-	GetOperationOperation:                           []string{},
-	MigrateMapsOperation:                            []string{},
-	ReleaseSubmissionsOperation:                     []string{},
-	SessionRolesOperation:                           []string{},
-	SessionUserOperation:                            []string{},
-	SessionValidateOperation:                        []string{},
-	SetMapfixCompletedOperation:                     []string{},
-	SetSubmissionCompletedOperation:                 []string{},
-	UpdateMapfixModelOperation:                      []string{},
-	UpdateScriptOperation:                           []string{},
-	UpdateScriptPolicyOperation:                     []string{},
-	UpdateSubmissionModelOperation:                  []string{},
-}
-
 func (s *Server) securityCookieAuth(ctx context.Context, operationName OperationName, req *http.Request) (context.Context, bool, error) {
 	var t CookieAuth
 	const parameterName = "session_id"
@@ -93,7 +46,6 @@ func (s *Server) securityCookieAuth(ctx context.Context, operationName Operation
 		return nil, false, errors.Wrap(err, "get cookie value")
 	}
 	t.APIKey = value
-	t.Roles = operationRolesCookieAuth[operationName]
 	rctx, err := s.sec.HandleCookieAuth(ctx, operationName, t)
 	if errors.Is(err, ogenerrors.ErrSkipServerSecurity) {
 		return nil, false, nil

pkg/api/oas_server_gen.go

@@ -8,79 +8,12 @@ import (
 
 // Handler handles operations described by OpenAPI v3 specification.
 type Handler interface {
-	// ActionMapfixAccepted implements actionMapfixAccepted operation.
+	// ActionSubmissionPublish implements actionSubmissionPublish operation.
 	//
-	// Role Reviewer manually resets validating softlock and changes status from Validating -> Accepted.
+	// (Internal endpoint) Role Validator changes status from Publishing -> Published.
 	//
-	// POST /mapfixes/{MapfixID}/status/reset-validating
+	// POST /submissions/{SubmissionID}/status/validator-published
-	ActionMapfixAccepted(ctx context.Context, params ActionMapfixAcceptedParams) error
+	ActionSubmissionPublish(ctx context.Context, params ActionSubmissionPublishParams) error
-	// ActionMapfixReject implements actionMapfixReject operation.
-	//
-	// Role Reviewer changes status from Submitted -> Rejected.
-	//
-	// POST /mapfixes/{MapfixID}/status/reject
-	ActionMapfixReject(ctx context.Context, params ActionMapfixRejectParams) error
-	// ActionMapfixRequestChanges implements actionMapfixRequestChanges operation.
-	//
-	// Role Reviewer changes status from Validated|Accepted|Submitted -> ChangesRequested.
-	//
-	// POST /mapfixes/{MapfixID}/status/request-changes
-	ActionMapfixRequestChanges(ctx context.Context, params ActionMapfixRequestChangesParams) error
-	// ActionMapfixResetSubmitting implements actionMapfixResetSubmitting operation.
-	//
-	// Role Submitter manually resets submitting softlock and changes status from Submitting ->
-	// UnderConstruction.
-	//
-	// POST /mapfixes/{MapfixID}/status/reset-submitting
-	ActionMapfixResetSubmitting(ctx context.Context, params ActionMapfixResetSubmittingParams) error
-	// ActionMapfixRetryValidate implements actionMapfixRetryValidate operation.
-	//
-	// Role Reviewer re-runs validation and changes status from Accepted -> Validating.
-	//
-	// POST /mapfixes/{MapfixID}/status/retry-validate
-	ActionMapfixRetryValidate(ctx context.Context, params ActionMapfixRetryValidateParams) error
-	// ActionMapfixRevoke implements actionMapfixRevoke operation.
-	//
-	// Role Submitter changes status from Submitted|ChangesRequested -> UnderConstruction.
-	//
-	// POST /mapfixes/{MapfixID}/status/revoke
-	ActionMapfixRevoke(ctx context.Context, params ActionMapfixRevokeParams) error
-	// ActionMapfixTriggerSubmit implements actionMapfixTriggerSubmit operation.
-	//
-	// Role Submitter changes status from UnderConstruction|ChangesRequested -> Submitting.
-	//
-	// POST /mapfixes/{MapfixID}/status/trigger-submit
-	ActionMapfixTriggerSubmit(ctx context.Context, params ActionMapfixTriggerSubmitParams) error
-	// ActionMapfixTriggerSubmitUnchecked implements actionMapfixTriggerSubmitUnchecked operation.
-	//
-	// Role Reviewer changes status from ChangesRequested -> Submitting.
-	//
-	// POST /mapfixes/{MapfixID}/status/trigger-submit-unchecked
-	ActionMapfixTriggerSubmitUnchecked(ctx context.Context, params ActionMapfixTriggerSubmitUncheckedParams) error
-	// ActionMapfixTriggerUpload implements actionMapfixTriggerUpload operation.
-	//
-	// Role Admin changes status from Validated -> Uploading.
-	//
-	// POST /mapfixes/{MapfixID}/status/trigger-upload
-	ActionMapfixTriggerUpload(ctx context.Context, params ActionMapfixTriggerUploadParams) error
-	// ActionMapfixTriggerValidate implements actionMapfixTriggerValidate operation.
-	//
-	// Role Reviewer triggers validation and changes status from Submitted -> Validating.
-	//
-	// POST /mapfixes/{MapfixID}/status/trigger-validate
-	ActionMapfixTriggerValidate(ctx context.Context, params ActionMapfixTriggerValidateParams) error
-	// ActionMapfixValidated implements actionMapfixValidated operation.
-	//
-	// Role Admin manually resets uploading softlock and changes status from Uploading -> Validated.
-	//
-	// POST /mapfixes/{MapfixID}/status/reset-uploading
-	ActionMapfixValidated(ctx context.Context, params ActionMapfixValidatedParams) error
-	// ActionSubmissionAccepted implements actionSubmissionAccepted operation.
-	//
-	// Role Reviewer manually resets validating softlock and changes status from Validating -> Accepted.
-	//
-	// POST /submissions/{SubmissionID}/status/reset-validating
-	ActionSubmissionAccepted(ctx context.Context, params ActionSubmissionAcceptedParams) error
 	// ActionSubmissionReject implements actionSubmissionReject operation.
 	//
 	// Role Reviewer changes status from Submitted -> Rejected.
@@ -93,97 +26,54 @@ type Handler interface {
 	//
 	// POST /submissions/{SubmissionID}/status/request-changes
 	ActionSubmissionRequestChanges(ctx context.Context, params ActionSubmissionRequestChangesParams) error
-	// ActionSubmissionResetSubmitting implements actionSubmissionResetSubmitting operation.
-	//
-	// Role Submitter manually resets submitting softlock and changes status from Submitting ->
-	// UnderConstruction.
-	//
-	// POST /submissions/{SubmissionID}/status/reset-submitting
-	ActionSubmissionResetSubmitting(ctx context.Context, params ActionSubmissionResetSubmittingParams) error
-	// ActionSubmissionRetryValidate implements actionSubmissionRetryValidate operation.
-	//
-	// Role Reviewer re-runs validation and changes status from Accepted -> Validating.
-	//
-	// POST /submissions/{SubmissionID}/status/retry-validate
-	ActionSubmissionRetryValidate(ctx context.Context, params ActionSubmissionRetryValidateParams) error
 	// ActionSubmissionRevoke implements actionSubmissionRevoke operation.
 	//
 	// Role Submitter changes status from Submitted|ChangesRequested -> UnderConstruction.
 	//
 	// POST /submissions/{SubmissionID}/status/revoke
 	ActionSubmissionRevoke(ctx context.Context, params ActionSubmissionRevokeParams) error
-	// ActionSubmissionTriggerSubmit implements actionSubmissionTriggerSubmit operation.
+	// ActionSubmissionSubmit implements actionSubmissionSubmit operation.
 	//
-	// Role Submitter changes status from UnderConstruction|ChangesRequested -> Submitting.
+	// Role Submitter changes status from UnderConstruction|ChangesRequested -> Submitted.
 	//
-	// POST /submissions/{SubmissionID}/status/trigger-submit
+	// POST /submissions/{SubmissionID}/status/submit
-	ActionSubmissionTriggerSubmit(ctx context.Context, params ActionSubmissionTriggerSubmitParams) error
+	ActionSubmissionSubmit(ctx context.Context, params ActionSubmissionSubmitParams) error
-	// ActionSubmissionTriggerSubmitUnchecked implements actionSubmissionTriggerSubmitUnchecked operation.
+	// ActionSubmissionTriggerPublish implements actionSubmissionTriggerPublish operation.
 	//
-	// Role Reviewer changes status from ChangesRequested -> Submitting.
+	// Role Admin changes status from Validated -> Publishing.
 	//
-	// POST /submissions/{SubmissionID}/status/trigger-submit-unchecked
+	// POST /submissions/{SubmissionID}/status/trigger-publish
-	ActionSubmissionTriggerSubmitUnchecked(ctx context.Context, params ActionSubmissionTriggerSubmitUncheckedParams) error
+	ActionSubmissionTriggerPublish(ctx context.Context, params ActionSubmissionTriggerPublishParams) error
-	// ActionSubmissionTriggerUpload implements actionSubmissionTriggerUpload operation.
-	//
-	// Role Admin changes status from Validated -> Uploading.
-	//
-	// POST /submissions/{SubmissionID}/status/trigger-upload
-	ActionSubmissionTriggerUpload(ctx context.Context, params ActionSubmissionTriggerUploadParams) error
 	// ActionSubmissionTriggerValidate implements actionSubmissionTriggerValidate operation.
 	//
-	// Role Reviewer triggers validation and changes status from Submitted -> Validating.
+	// Role Reviewer triggers validation and changes status from Submitted|Accepted -> Validating.
 	//
 	// POST /submissions/{SubmissionID}/status/trigger-validate
 	ActionSubmissionTriggerValidate(ctx context.Context, params ActionSubmissionTriggerValidateParams) error
-	// ActionSubmissionValidated implements actionSubmissionValidated operation.
+	// ActionSubmissionValidate implements actionSubmissionValidate operation.
 	//
-	// Role Admin manually resets uploading softlock and changes status from Uploading -> Validated.
+	// (Internal endpoint) Role Validator changes status from Validating -> Validated.
 	//
-	// POST /submissions/{SubmissionID}/status/reset-uploading
+	// POST /submissions/{SubmissionID}/status/validator-validated
-	ActionSubmissionValidated(ctx context.Context, params ActionSubmissionValidatedParams) error
+	ActionSubmissionValidate(ctx context.Context, params ActionSubmissionValidateParams) error
-	// CreateMapfix implements createMapfix operation.
-	//
-	// Trigger the validator to create a mapfix.
-	//
-	// POST /mapfixes
-	CreateMapfix(ctx context.Context, req *MapfixTriggerCreate) (*OperationID, error)
-	// CreateMapfixAuditComment implements createMapfixAuditComment operation.
-	//
-	// Post a comment to the audit log.
-	//
-	// POST /mapfixes/{MapfixID}/comment
-	CreateMapfixAuditComment(ctx context.Context, req CreateMapfixAuditCommentReq, params CreateMapfixAuditCommentParams) error
 	// CreateScript implements createScript operation.
 	//
 	// Create a new script.
 	//
 	// POST /scripts
-	CreateScript(ctx context.Context, req *ScriptCreate) (*ScriptID, error)
+	CreateScript(ctx context.Context, req *ScriptCreate) (*ID, error)
 	// CreateScriptPolicy implements createScriptPolicy operation.
 	//
 	// Create a new script policy.
 	//
 	// POST /script-policy
-	CreateScriptPolicy(ctx context.Context, req *ScriptPolicyCreate) (*ScriptPolicyID, error)
+	CreateScriptPolicy(ctx context.Context, req *ScriptPolicyCreate) (*ID, error)
 	// CreateSubmission implements createSubmission operation.
 	//
-	// Trigger the validator to create a new submission.
+	// Create new submission.
 	//
 	// POST /submissions
-	CreateSubmission(ctx context.Context, req *SubmissionTriggerCreate) (*OperationID, error)
+	CreateSubmission(ctx context.Context, req *SubmissionCreate) (*ID, error)
-	// CreateSubmissionAdmin implements createSubmissionAdmin operation.
-	//
-	// Trigger the validator to create a new submission.
-	//
-	// POST /submissions-admin
-	CreateSubmissionAdmin(ctx context.Context, req *SubmissionTriggerCreate) (*OperationID, error)
-	// CreateSubmissionAuditComment implements createSubmissionAuditComment operation.
-	//
-	// Post a comment to the audit log.
-	//
-	// POST /submissions/{SubmissionID}/comment
-	CreateSubmissionAuditComment(ctx context.Context, req CreateSubmissionAuditCommentReq, params CreateSubmissionAuditCommentParams) error
 	// DeleteScript implements deleteScript operation.
 	//
 	// Delete the specified script by ID.
@@ -194,32 +84,8 @@ type Handler interface {
 	//
 	// Delete the specified script policy by ID.
 	//
-	// DELETE /script-policy/{ScriptPolicyID}
+	// DELETE /script-policy/id/{ScriptPolicyID}
 	DeleteScriptPolicy(ctx context.Context, params DeleteScriptPolicyParams) error
-	// DownloadMapAsset implements downloadMapAsset operation.
-	//
-	// Download the map asset.
-	//
-	// GET /maps/{MapID}/download
-	DownloadMapAsset(ctx context.Context, params DownloadMapAssetParams) (DownloadMapAssetOK, error)
-	// GetMap implements getMap operation.
-	//
-	// Retrieve map with ID.
-	//
-	// GET /maps/{MapID}
-	GetMap(ctx context.Context, params GetMapParams) (*Map, error)
-	// GetMapfix implements getMapfix operation.
-	//
-	// Retrieve map with ID.
-	//
-	// GET /mapfixes/{MapfixID}
-	GetMapfix(ctx context.Context, params GetMapfixParams) (*Mapfix, error)
-	// GetOperation implements getOperation operation.
-	//
-	// Retrieve operation with ID.
-	//
-	// GET /operations/{OperationID}
-	GetOperation(ctx context.Context, params GetOperationParams) (*Operation, error)
 	// GetScript implements getScript operation.
 	//
 	// Get the specified script by ID.
@@ -230,104 +96,32 @@ type Handler interface {
 	//
 	// Get the specified script policy by ID.
 	//
-	// GET /script-policy/{ScriptPolicyID}
+	// GET /script-policy/id/{ScriptPolicyID}
 	GetScriptPolicy(ctx context.Context, params GetScriptPolicyParams) (*ScriptPolicy, error)
+	// GetScriptPolicyFromHash implements getScriptPolicyFromHash operation.
+	//
+	// Get the policy for the given hash of script source code.
+	//
+	// GET /script-policy/hash/{FromScriptHash}
+	GetScriptPolicyFromHash(ctx context.Context, params GetScriptPolicyFromHashParams) (*ScriptPolicy, error)
 	// GetSubmission implements getSubmission operation.
 	//
 	// Retrieve map with ID.
 	//
 	// GET /submissions/{SubmissionID}
 	GetSubmission(ctx context.Context, params GetSubmissionParams) (*Submission, error)
-	// ListMapfixAuditEvents implements listMapfixAuditEvents operation.
-	//
-	// Retrieve a list of audit events.
-	//
-	// GET /mapfixes/{MapfixID}/audit-events
-	ListMapfixAuditEvents(ctx context.Context, params ListMapfixAuditEventsParams) ([]AuditEvent, error)
-	// ListMapfixes implements listMapfixes operation.
-	//
-	// Get list of mapfixes.
-	//
-	// GET /mapfixes
-	ListMapfixes(ctx context.Context, params ListMapfixesParams) (*Mapfixes, error)
-	// ListMaps implements listMaps operation.
-	//
-	// Get list of maps.
-	//
-	// GET /maps
-	ListMaps(ctx context.Context, params ListMapsParams) ([]Map, error)
-	// ListScriptPolicy implements listScriptPolicy operation.
-	//
-	// Get list of script policies.
-	//
-	// GET /script-policy
-	ListScriptPolicy(ctx context.Context, params ListScriptPolicyParams) ([]ScriptPolicy, error)
-	// ListScripts implements listScripts operation.
-	//
-	// Get list of scripts.
-	//
-	// GET /scripts
-	ListScripts(ctx context.Context, params ListScriptsParams) ([]Script, error)
-	// ListSubmissionAuditEvents implements listSubmissionAuditEvents operation.
-	//
-	// Retrieve a list of audit events.
-	//
-	// GET /submissions/{SubmissionID}/audit-events
-	ListSubmissionAuditEvents(ctx context.Context, params ListSubmissionAuditEventsParams) ([]AuditEvent, error)
 	// ListSubmissions implements listSubmissions operation.
 	//
 	// Get list of submissions.
 	//
 	// GET /submissions
-	ListSubmissions(ctx context.Context, params ListSubmissionsParams) (*Submissions, error)
+	ListSubmissions(ctx context.Context, params ListSubmissionsParams) ([]Submission, error)
-	// MigrateMaps implements migrateMaps operation.
-	//
-	// Perform maps migration.
-	//
-	// POST /migrate-maps
-	MigrateMaps(ctx context.Context) error
-	// ReleaseSubmissions implements releaseSubmissions operation.
-	//
-	// Release a set of uploaded maps.
-	//
-	// POST /release-submissions
-	ReleaseSubmissions(ctx context.Context, req []ReleaseInfo) error
-	// SessionRoles implements sessionRoles operation.
-	//
-	// Get list of roles for the current session.
-	//
-	// GET /session/roles
-	SessionRoles(ctx context.Context) (*Roles, error)
-	// SessionUser implements sessionUser operation.
-	//
-	// Get information about the currently logged in user.
-	//
-	// GET /session/user
-	SessionUser(ctx context.Context) (*User, error)
-	// SessionValidate implements sessionValidate operation.
-	//
-	// Ask if the current session is valid.
-	//
-	// GET /session/validate
-	SessionValidate(ctx context.Context) (bool, error)
-	// SetMapfixCompleted implements setMapfixCompleted operation.
-	//
-	// Called by maptest when a player completes the map.
-	//
-	// POST /mapfixes/{MapfixID}/completed
-	SetMapfixCompleted(ctx context.Context, params SetMapfixCompletedParams) error
 	// SetSubmissionCompleted implements setSubmissionCompleted operation.
 	//
-	// Called by maptest when a player completes the map.
+	// Retrieve map with ID.
 	//
 	// POST /submissions/{SubmissionID}/completed
 	SetSubmissionCompleted(ctx context.Context, params SetSubmissionCompletedParams) error
-	// UpdateMapfixModel implements updateMapfixModel operation.
-	//
-	// Update model following role restrictions.
-	//
-	// POST /mapfixes/{MapfixID}/model
-	UpdateMapfixModel(ctx context.Context, params UpdateMapfixModelParams) error
 	// UpdateScript implements updateScript operation.
 	//
 	// Update the specified script by ID.
@@ -338,7 +132,7 @@ type Handler interface {
 	//
 	// Update the specified script policy by ID.
 	//
-	// POST /script-policy/{ScriptPolicyID}
+	// POST /script-policy/id/{ScriptPolicyID}
 	UpdateScriptPolicy(ctx context.Context, req *ScriptPolicyUpdate, params UpdateScriptPolicyParams) error
 	// UpdateSubmissionModel implements updateSubmissionModel operation.
 	//

pkg/api/oas_unimplemented_gen.go

@@ -13,112 +13,12 @@ type UnimplementedHandler struct{}
 
 var _ Handler = UnimplementedHandler{}
 
-// ActionMapfixAccepted implements actionMapfixAccepted operation.
+// ActionSubmissionPublish implements actionSubmissionPublish operation.
 //
-// Role Reviewer manually resets validating softlock and changes status from Validating -> Accepted.
+// (Internal endpoint) Role Validator changes status from Publishing -> Published.
 //
-// POST /mapfixes/{MapfixID}/status/reset-validating
+// POST /submissions/{SubmissionID}/status/validator-published
-func (UnimplementedHandler) ActionMapfixAccepted(ctx context.Context, params ActionMapfixAcceptedParams) error {
+func (UnimplementedHandler) ActionSubmissionPublish(ctx context.Context, params ActionSubmissionPublishParams) error {
-	return ht.ErrNotImplemented
-}
-
-// ActionMapfixReject implements actionMapfixReject operation.
-//
-// Role Reviewer changes status from Submitted -> Rejected.
-//
-// POST /mapfixes/{MapfixID}/status/reject
-func (UnimplementedHandler) ActionMapfixReject(ctx context.Context, params ActionMapfixRejectParams) error {
-	return ht.ErrNotImplemented
-}
-
-// ActionMapfixRequestChanges implements actionMapfixRequestChanges operation.
-//
-// Role Reviewer changes status from Validated|Accepted|Submitted -> ChangesRequested.
-//
-// POST /mapfixes/{MapfixID}/status/request-changes
-func (UnimplementedHandler) ActionMapfixRequestChanges(ctx context.Context, params ActionMapfixRequestChangesParams) error {
-	return ht.ErrNotImplemented
-}
-
-// ActionMapfixResetSubmitting implements actionMapfixResetSubmitting operation.
-//
-// Role Submitter manually resets submitting softlock and changes status from Submitting ->
-// UnderConstruction.
-//
-// POST /mapfixes/{MapfixID}/status/reset-submitting
-func (UnimplementedHandler) ActionMapfixResetSubmitting(ctx context.Context, params ActionMapfixResetSubmittingParams) error {
-	return ht.ErrNotImplemented
-}
-
-// ActionMapfixRetryValidate implements actionMapfixRetryValidate operation.
-//
-// Role Reviewer re-runs validation and changes status from Accepted -> Validating.
-//
-// POST /mapfixes/{MapfixID}/status/retry-validate
-func (UnimplementedHandler) ActionMapfixRetryValidate(ctx context.Context, params ActionMapfixRetryValidateParams) error {
-	return ht.ErrNotImplemented
-}
-
-// ActionMapfixRevoke implements actionMapfixRevoke operation.
-//
-// Role Submitter changes status from Submitted|ChangesRequested -> UnderConstruction.
-//
-// POST /mapfixes/{MapfixID}/status/revoke
-func (UnimplementedHandler) ActionMapfixRevoke(ctx context.Context, params ActionMapfixRevokeParams) error {
-	return ht.ErrNotImplemented
-}
-
-// ActionMapfixTriggerSubmit implements actionMapfixTriggerSubmit operation.
-//
-// Role Submitter changes status from UnderConstruction|ChangesRequested -> Submitting.
-//
-// POST /mapfixes/{MapfixID}/status/trigger-submit
-func (UnimplementedHandler) ActionMapfixTriggerSubmit(ctx context.Context, params ActionMapfixTriggerSubmitParams) error {
-	return ht.ErrNotImplemented
-}
-
-// ActionMapfixTriggerSubmitUnchecked implements actionMapfixTriggerSubmitUnchecked operation.
-//
-// Role Reviewer changes status from ChangesRequested -> Submitting.
-//
-// POST /mapfixes/{MapfixID}/status/trigger-submit-unchecked
-func (UnimplementedHandler) ActionMapfixTriggerSubmitUnchecked(ctx context.Context, params ActionMapfixTriggerSubmitUncheckedParams) error {
-	return ht.ErrNotImplemented
-}
-
-// ActionMapfixTriggerUpload implements actionMapfixTriggerUpload operation.
-//
-// Role Admin changes status from Validated -> Uploading.
-//
-// POST /mapfixes/{MapfixID}/status/trigger-upload
-func (UnimplementedHandler) ActionMapfixTriggerUpload(ctx context.Context, params ActionMapfixTriggerUploadParams) error {
-	return ht.ErrNotImplemented
-}
-
-// ActionMapfixTriggerValidate implements actionMapfixTriggerValidate operation.
-//
-// Role Reviewer triggers validation and changes status from Submitted -> Validating.
-//
-// POST /mapfixes/{MapfixID}/status/trigger-validate
-func (UnimplementedHandler) ActionMapfixTriggerValidate(ctx context.Context, params ActionMapfixTriggerValidateParams) error {
-	return ht.ErrNotImplemented
-}
-
-// ActionMapfixValidated implements actionMapfixValidated operation.
-//
-// Role Admin manually resets uploading softlock and changes status from Uploading -> Validated.
-//
-// POST /mapfixes/{MapfixID}/status/reset-uploading
-func (UnimplementedHandler) ActionMapfixValidated(ctx context.Context, params ActionMapfixValidatedParams) error {
-	return ht.ErrNotImplemented
-}
-
-// ActionSubmissionAccepted implements actionSubmissionAccepted operation.
-//
-// Role Reviewer manually resets validating softlock and changes status from Validating -> Accepted.
-//
-// POST /submissions/{SubmissionID}/status/reset-validating
-func (UnimplementedHandler) ActionSubmissionAccepted(ctx context.Context, params ActionSubmissionAcceptedParams) error {
 	return ht.ErrNotImplemented
 }
 
@@ -140,25 +40,6 @@ func (UnimplementedHandler) ActionSubmissionRequestChanges(ctx context.Context,
 	return ht.ErrNotImplemented
 }
 
-// ActionSubmissionResetSubmitting implements actionSubmissionResetSubmitting operation.
-//
-// Role Submitter manually resets submitting softlock and changes status from Submitting ->
-// UnderConstruction.
-//
-// POST /submissions/{SubmissionID}/status/reset-submitting
-func (UnimplementedHandler) ActionSubmissionResetSubmitting(ctx context.Context, params ActionSubmissionResetSubmittingParams) error {
-	return ht.ErrNotImplemented
-}
-
-// ActionSubmissionRetryValidate implements actionSubmissionRetryValidate operation.
-//
-// Role Reviewer re-runs validation and changes status from Accepted -> Validating.
-//
-// POST /submissions/{SubmissionID}/status/retry-validate
-func (UnimplementedHandler) ActionSubmissionRetryValidate(ctx context.Context, params ActionSubmissionRetryValidateParams) error {
-	return ht.ErrNotImplemented
-}
-
 // ActionSubmissionRevoke implements actionSubmissionRevoke operation.
 //
 // Role Submitter changes status from Submitted|ChangesRequested -> UnderConstruction.
@@ -168,66 +49,39 @@ func (UnimplementedHandler) ActionSubmissionRevoke(ctx context.Context, params A
 	return ht.ErrNotImplemented
 }
 
-// ActionSubmissionTriggerSubmit implements actionSubmissionTriggerSubmit operation.
+// ActionSubmissionSubmit implements actionSubmissionSubmit operation.
 //
-// Role Submitter changes status from UnderConstruction|ChangesRequested -> Submitting.
+// Role Submitter changes status from UnderConstruction|ChangesRequested -> Submitted.
 //
-// POST /submissions/{SubmissionID}/status/trigger-submit
+// POST /submissions/{SubmissionID}/status/submit
-func (UnimplementedHandler) ActionSubmissionTriggerSubmit(ctx context.Context, params ActionSubmissionTriggerSubmitParams) error {
+func (UnimplementedHandler) ActionSubmissionSubmit(ctx context.Context, params ActionSubmissionSubmitParams) error {
 	return ht.ErrNotImplemented
 }
 
-// ActionSubmissionTriggerSubmitUnchecked implements actionSubmissionTriggerSubmitUnchecked operation.
+// ActionSubmissionTriggerPublish implements actionSubmissionTriggerPublish operation.
 //
-// Role Reviewer changes status from ChangesRequested -> Submitting.
+// Role Admin changes status from Validated -> Publishing.
 //
-// POST /submissions/{SubmissionID}/status/trigger-submit-unchecked
+// POST /submissions/{SubmissionID}/status/trigger-publish
-func (UnimplementedHandler) ActionSubmissionTriggerSubmitUnchecked(ctx context.Context, params ActionSubmissionTriggerSubmitUncheckedParams) error {
+func (UnimplementedHandler) ActionSubmissionTriggerPublish(ctx context.Context, params ActionSubmissionTriggerPublishParams) error {
-	return ht.ErrNotImplemented
-}
-
-// ActionSubmissionTriggerUpload implements actionSubmissionTriggerUpload operation.
-//
-// Role Admin changes status from Validated -> Uploading.
-//
-// POST /submissions/{SubmissionID}/status/trigger-upload
-func (UnimplementedHandler) ActionSubmissionTriggerUpload(ctx context.Context, params ActionSubmissionTriggerUploadParams) error {
 	return ht.ErrNotImplemented
 }
 
 // ActionSubmissionTriggerValidate implements actionSubmissionTriggerValidate operation.
 //
-// Role Reviewer triggers validation and changes status from Submitted -> Validating.
+// Role Reviewer triggers validation and changes status from Submitted|Accepted -> Validating.
 //
 // POST /submissions/{SubmissionID}/status/trigger-validate
 func (UnimplementedHandler) ActionSubmissionTriggerValidate(ctx context.Context, params ActionSubmissionTriggerValidateParams) error {
 	return ht.ErrNotImplemented
 }
 
-// ActionSubmissionValidated implements actionSubmissionValidated operation.
+// ActionSubmissionValidate implements actionSubmissionValidate operation.
 //
-// Role Admin manually resets uploading softlock and changes status from Uploading -> Validated.
+// (Internal endpoint) Role Validator changes status from Validating -> Validated.
 //
-// POST /submissions/{SubmissionID}/status/reset-uploading
+// POST /submissions/{SubmissionID}/status/validator-validated
-func (UnimplementedHandler) ActionSubmissionValidated(ctx context.Context, params ActionSubmissionValidatedParams) error {
+func (UnimplementedHandler) ActionSubmissionValidate(ctx context.Context, params ActionSubmissionValidateParams) error {
-	return ht.ErrNotImplemented
-}
-
-// CreateMapfix implements createMapfix operation.
-//
-// Trigger the validator to create a mapfix.
-//
-// POST /mapfixes
-func (UnimplementedHandler) CreateMapfix(ctx context.Context, req *MapfixTriggerCreate) (r *OperationID, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// CreateMapfixAuditComment implements createMapfixAuditComment operation.
-//
-// Post a comment to the audit log.
-//
-// POST /mapfixes/{MapfixID}/comment
-func (UnimplementedHandler) CreateMapfixAuditComment(ctx context.Context, req CreateMapfixAuditCommentReq, params CreateMapfixAuditCommentParams) error {
 	return ht.ErrNotImplemented
 }
 
@@ -236,7 +90,7 @@ func (UnimplementedHandler) CreateMapfixAuditComment(ctx context.Context, req Cr
 // Create a new script.
 //
 // POST /scripts
-func (UnimplementedHandler) CreateScript(ctx context.Context, req *ScriptCreate) (r *ScriptID, _ error) {
+func (UnimplementedHandler) CreateScript(ctx context.Context, req *ScriptCreate) (r *ID, _ error) {
 	return r, ht.ErrNotImplemented
 }
 
@@ -245,37 +99,19 @@ func (UnimplementedHandler) CreateScript(ctx context.Context, req *ScriptCreate)
 // Create a new script policy.
 //
 // POST /script-policy
-func (UnimplementedHandler) CreateScriptPolicy(ctx context.Context, req *ScriptPolicyCreate) (r *ScriptPolicyID, _ error) {
+func (UnimplementedHandler) CreateScriptPolicy(ctx context.Context, req *ScriptPolicyCreate) (r *ID, _ error) {
 	return r, ht.ErrNotImplemented
 }
 
 // CreateSubmission implements createSubmission operation.
 //
-// Trigger the validator to create a new submission.
+// Create new submission.
 //
 // POST /submissions
-func (UnimplementedHandler) CreateSubmission(ctx context.Context, req *SubmissionTriggerCreate) (r *OperationID, _ error) {
+func (UnimplementedHandler) CreateSubmission(ctx context.Context, req *SubmissionCreate) (r *ID, _ error) {
 	return r, ht.ErrNotImplemented
 }
 
-// CreateSubmissionAdmin implements createSubmissionAdmin operation.
-//
-// Trigger the validator to create a new submission.
-//
-// POST /submissions-admin
-func (UnimplementedHandler) CreateSubmissionAdmin(ctx context.Context, req *SubmissionTriggerCreate) (r *OperationID, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// CreateSubmissionAuditComment implements createSubmissionAuditComment operation.
-//
-// Post a comment to the audit log.
-//
-// POST /submissions/{SubmissionID}/comment
-func (UnimplementedHandler) CreateSubmissionAuditComment(ctx context.Context, req CreateSubmissionAuditCommentReq, params CreateSubmissionAuditCommentParams) error {
-	return ht.ErrNotImplemented
-}
-
 // DeleteScript implements deleteScript operation.
 //
 // Delete the specified script by ID.
@@ -289,47 +125,11 @@ func (UnimplementedHandler) DeleteScript(ctx context.Context, params DeleteScrip
 //
 // Delete the specified script policy by ID.
 //
-// DELETE /script-policy/{ScriptPolicyID}
+// DELETE /script-policy/id/{ScriptPolicyID}
 func (UnimplementedHandler) DeleteScriptPolicy(ctx context.Context, params DeleteScriptPolicyParams) error {
 	return ht.ErrNotImplemented
 }
 
-// DownloadMapAsset implements downloadMapAsset operation.
-//
-// Download the map asset.
-//
-// GET /maps/{MapID}/download
-func (UnimplementedHandler) DownloadMapAsset(ctx context.Context, params DownloadMapAssetParams) (r DownloadMapAssetOK, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// GetMap implements getMap operation.
-//
-// Retrieve map with ID.
-//
-// GET /maps/{MapID}
-func (UnimplementedHandler) GetMap(ctx context.Context, params GetMapParams) (r *Map, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// GetMapfix implements getMapfix operation.
-//
-// Retrieve map with ID.
-//
-// GET /mapfixes/{MapfixID}
-func (UnimplementedHandler) GetMapfix(ctx context.Context, params GetMapfixParams) (r *Mapfix, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// GetOperation implements getOperation operation.
-//
-// Retrieve operation with ID.
-//
-// GET /operations/{OperationID}
-func (UnimplementedHandler) GetOperation(ctx context.Context, params GetOperationParams) (r *Operation, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
 // GetScript implements getScript operation.
 //
 // Get the specified script by ID.
@@ -343,11 +143,20 @@ func (UnimplementedHandler) GetScript(ctx context.Context, params GetScriptParam
 //
 // Get the specified script policy by ID.
 //
-// GET /script-policy/{ScriptPolicyID}
+// GET /script-policy/id/{ScriptPolicyID}
 func (UnimplementedHandler) GetScriptPolicy(ctx context.Context, params GetScriptPolicyParams) (r *ScriptPolicy, _ error) {
 	return r, ht.ErrNotImplemented
 }
 
+// GetScriptPolicyFromHash implements getScriptPolicyFromHash operation.
+//
+// Get the policy for the given hash of script source code.
+//
+// GET /script-policy/hash/{FromScriptHash}
+func (UnimplementedHandler) GetScriptPolicyFromHash(ctx context.Context, params GetScriptPolicyFromHashParams) (r *ScriptPolicy, _ error) {
+	return r, ht.ErrNotImplemented
+}
+
 // GetSubmission implements getSubmission operation.
 //
 // Retrieve map with ID.
@@ -357,141 +166,24 @@ func (UnimplementedHandler) GetSubmission(ctx context.Context, params GetSubmiss
 	return r, ht.ErrNotImplemented
 }
 
-// ListMapfixAuditEvents implements listMapfixAuditEvents operation.
-//
-// Retrieve a list of audit events.
-//
-// GET /mapfixes/{MapfixID}/audit-events
-func (UnimplementedHandler) ListMapfixAuditEvents(ctx context.Context, params ListMapfixAuditEventsParams) (r []AuditEvent, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// ListMapfixes implements listMapfixes operation.
-//
-// Get list of mapfixes.
-//
-// GET /mapfixes
-func (UnimplementedHandler) ListMapfixes(ctx context.Context, params ListMapfixesParams) (r *Mapfixes, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// ListMaps implements listMaps operation.
-//
-// Get list of maps.
-//
-// GET /maps
-func (UnimplementedHandler) ListMaps(ctx context.Context, params ListMapsParams) (r []Map, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// ListScriptPolicy implements listScriptPolicy operation.
-//
-// Get list of script policies.
-//
-// GET /script-policy
-func (UnimplementedHandler) ListScriptPolicy(ctx context.Context, params ListScriptPolicyParams) (r []ScriptPolicy, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// ListScripts implements listScripts operation.
-//
-// Get list of scripts.
-//
-// GET /scripts
-func (UnimplementedHandler) ListScripts(ctx context.Context, params ListScriptsParams) (r []Script, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// ListSubmissionAuditEvents implements listSubmissionAuditEvents operation.
-//
-// Retrieve a list of audit events.
-//
-// GET /submissions/{SubmissionID}/audit-events
-func (UnimplementedHandler) ListSubmissionAuditEvents(ctx context.Context, params ListSubmissionAuditEventsParams) (r []AuditEvent, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
 // ListSubmissions implements listSubmissions operation.
 //
 // Get list of submissions.
 //
 // GET /submissions
-func (UnimplementedHandler) ListSubmissions(ctx context.Context, params ListSubmissionsParams) (r *Submissions, _ error) {
+func (UnimplementedHandler) ListSubmissions(ctx context.Context, params ListSubmissionsParams) (r []Submission, _ error) {
 	return r, ht.ErrNotImplemented
 }
 
-// MigrateMaps implements migrateMaps operation.
-//
-// Perform maps migration.
-//
-// POST /migrate-maps
-func (UnimplementedHandler) MigrateMaps(ctx context.Context) error {
-	return ht.ErrNotImplemented
-}
-
-// ReleaseSubmissions implements releaseSubmissions operation.
-//
-// Release a set of uploaded maps.
-//
-// POST /release-submissions
-func (UnimplementedHandler) ReleaseSubmissions(ctx context.Context, req []ReleaseInfo) error {
-	return ht.ErrNotImplemented
-}
-
-// SessionRoles implements sessionRoles operation.
-//
-// Get list of roles for the current session.
-//
-// GET /session/roles
-func (UnimplementedHandler) SessionRoles(ctx context.Context) (r *Roles, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// SessionUser implements sessionUser operation.
-//
-// Get information about the currently logged in user.
-//
-// GET /session/user
-func (UnimplementedHandler) SessionUser(ctx context.Context) (r *User, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// SessionValidate implements sessionValidate operation.
-//
-// Ask if the current session is valid.
-//
-// GET /session/validate
-func (UnimplementedHandler) SessionValidate(ctx context.Context) (r bool, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// SetMapfixCompleted implements setMapfixCompleted operation.
-//
-// Called by maptest when a player completes the map.
-//
-// POST /mapfixes/{MapfixID}/completed
-func (UnimplementedHandler) SetMapfixCompleted(ctx context.Context, params SetMapfixCompletedParams) error {
-	return ht.ErrNotImplemented
-}
-
 // SetSubmissionCompleted implements setSubmissionCompleted operation.
 //
-// Called by maptest when a player completes the map.
+// Retrieve map with ID.
 //
 // POST /submissions/{SubmissionID}/completed
 func (UnimplementedHandler) SetSubmissionCompleted(ctx context.Context, params SetSubmissionCompletedParams) error {
 	return ht.ErrNotImplemented
 }
 
-// UpdateMapfixModel implements updateMapfixModel operation.
-//
-// Update model following role restrictions.
-//
-// POST /mapfixes/{MapfixID}/model
-func (UnimplementedHandler) UpdateMapfixModel(ctx context.Context, params UpdateMapfixModelParams) error {
-	return ht.ErrNotImplemented
-}
-
 // UpdateScript implements updateScript operation.
 //
 // Update the specified script by ID.
@@ -505,7 +197,7 @@ func (UnimplementedHandler) UpdateScript(ctx context.Context, req *ScriptUpdate,
 //
 // Update the specified script policy by ID.
 //
-// POST /script-policy/{ScriptPolicyID}
+// POST /script-policy/id/{ScriptPolicyID}
 func (UnimplementedHandler) UpdateScriptPolicy(ctx context.Context, req *ScriptPolicyUpdate, params UpdateScriptPolicyParams) error {
 	return ht.ErrNotImplemented
 }

pkg/api/oas_uri_gen.go

@@ -0,0 +1,305 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+import (
+	"math/bits"
+	"strconv"
+
+	"github.com/go-faster/errors"
+
+	"github.com/ogen-go/ogen/conv"
+	"github.com/ogen-go/ogen/uri"
+	"github.com/ogen-go/ogen/validate"
+)
+
+// EncodeURI encodes Pagination as URI form.
+func (s *Pagination) EncodeURI(e uri.Encoder) error {
+	if err := e.EncodeField("Page", func(e uri.Encoder) error {
+		return e.EncodeValue(conv.Int32ToString(s.Page))
+	}); err != nil {
+		return errors.Wrap(err, "encode field \"Page\"")
+	}
+	if err := e.EncodeField("Limit", func(e uri.Encoder) error {
+		return e.EncodeValue(conv.Int32ToString(s.Limit))
+	}); err != nil {
+		return errors.Wrap(err, "encode field \"Limit\"")
+	}
+	return nil
+}
+
+var uriFieldsNameOfPagination = [2]string{
+	0: "Page",
+	1: "Limit",
+}
+
+// DecodeURI decodes Pagination from URI form.
+func (s *Pagination) DecodeURI(d uri.Decoder) error {
+	if s == nil {
+		return errors.New("invalid: unable to decode Pagination to nil")
+	}
+	var requiredBitSet [1]uint8
+
+	if err := d.DecodeFields(func(k string, d uri.Decoder) error {
+		switch k {
+		case "Page":
+			requiredBitSet[0] |= 1 << 0
+			if err := func() error {
+				val, err := d.DecodeValue()
+				if err != nil {
+					return err
+				}
+
+				c, err := conv.ToInt32(val)
+				if err != nil {
+					return err
+				}
+
+				s.Page = c
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"Page\"")
+			}
+		case "Limit":
+			requiredBitSet[0] |= 1 << 1
+			if err := func() error {
+				val, err := d.DecodeValue()
+				if err != nil {
+					return err
+				}
+
+				c, err := conv.ToInt32(val)
+				if err != nil {
+					return err
+				}
+
+				s.Limit = c
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"Limit\"")
+			}
+		default:
+			return nil
+		}
+		return nil
+	}); err != nil {
+		return errors.Wrap(err, "decode Pagination")
+	}
+	// Validate required fields.
+	var failures []validate.FieldError
+	for i, mask := range [1]uint8{
+		0b00000011,
+	} {
+		if result := (requiredBitSet[i] & mask) ^ mask; result != 0 {
+			// Mask only required fields and check equality to mask using XOR.
+			//
+			// If XOR result is not zero, result is not equal to expected, so some fields are missed.
+			// Bits of fields which would be set are actually bits of missed fields.
+			missed := bits.OnesCount8(result)
+			for bitN := 0; bitN < missed; bitN++ {
+				bitIdx := bits.TrailingZeros8(result)
+				fieldIdx := i*8 + bitIdx
+				var name string
+				if fieldIdx < len(uriFieldsNameOfPagination) {
+					name = uriFieldsNameOfPagination[fieldIdx]
+				} else {
+					name = strconv.Itoa(fieldIdx)
+				}
+				failures = append(failures, validate.FieldError{
+					Name:  name,
+					Error: validate.ErrFieldRequired,
+				})
+				// Reset bit.
+				result &^= 1 << bitIdx
+			}
+		}
+	}
+	if len(failures) > 0 {
+		return &validate.Error{Fields: failures}
+	}
+
+	return nil
+}
+
+// EncodeURI encodes SubmissionFilter as URI form.
+func (s *SubmissionFilter) EncodeURI(e uri.Encoder) error {
+	if err := e.EncodeField("ID", func(e uri.Encoder) error {
+		return e.EncodeValue(conv.Int64ToString(s.ID))
+	}); err != nil {
+		return errors.Wrap(err, "encode field \"ID\"")
+	}
+	if err := e.EncodeField("DisplayName", func(e uri.Encoder) error {
+		if val, ok := s.DisplayName.Get(); ok {
+			return e.EncodeValue(conv.StringToString(val))
+		}
+		return nil
+	}); err != nil {
+		return errors.Wrap(err, "encode field \"DisplayName\"")
+	}
+	if err := e.EncodeField("Creator", func(e uri.Encoder) error {
+		if val, ok := s.Creator.Get(); ok {
+			return e.EncodeValue(conv.StringToString(val))
+		}
+		return nil
+	}); err != nil {
+		return errors.Wrap(err, "encode field \"Creator\"")
+	}
+	if err := e.EncodeField("GameID", func(e uri.Encoder) error {
+		if val, ok := s.GameID.Get(); ok {
+			return e.EncodeValue(conv.Int32ToString(val))
+		}
+		return nil
+	}); err != nil {
+		return errors.Wrap(err, "encode field \"GameID\"")
+	}
+	return nil
+}
+
+var uriFieldsNameOfSubmissionFilter = [4]string{
+	0: "ID",
+	1: "DisplayName",
+	2: "Creator",
+	3: "GameID",
+}
+
+// DecodeURI decodes SubmissionFilter from URI form.
+func (s *SubmissionFilter) DecodeURI(d uri.Decoder) error {
+	if s == nil {
+		return errors.New("invalid: unable to decode SubmissionFilter to nil")
+	}
+	var requiredBitSet [1]uint8
+
+	if err := d.DecodeFields(func(k string, d uri.Decoder) error {
+		switch k {
+		case "ID":
+			requiredBitSet[0] |= 1 << 0
+			if err := func() error {
+				val, err := d.DecodeValue()
+				if err != nil {
+					return err
+				}
+
+				c, err := conv.ToInt64(val)
+				if err != nil {
+					return err
+				}
+
+				s.ID = c
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"ID\"")
+			}
+		case "DisplayName":
+			if err := func() error {
+				var sDotDisplayNameVal string
+				if err := func() error {
+					val, err := d.DecodeValue()
+					if err != nil {
+						return err
+					}
+
+					c, err := conv.ToString(val)
+					if err != nil {
+						return err
+					}
+
+					sDotDisplayNameVal = c
+					return nil
+				}(); err != nil {
+					return err
+				}
+				s.DisplayName.SetTo(sDotDisplayNameVal)
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"DisplayName\"")
+			}
+		case "Creator":
+			if err := func() error {
+				var sDotCreatorVal string
+				if err := func() error {
+					val, err := d.DecodeValue()
+					if err != nil {
+						return err
+					}
+
+					c, err := conv.ToString(val)
+					if err != nil {
+						return err
+					}
+
+					sDotCreatorVal = c
+					return nil
+				}(); err != nil {
+					return err
+				}
+				s.Creator.SetTo(sDotCreatorVal)
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"Creator\"")
+			}
+		case "GameID":
+			if err := func() error {
+				var sDotGameIDVal int32
+				if err := func() error {
+					val, err := d.DecodeValue()
+					if err != nil {
+						return err
+					}
+
+					c, err := conv.ToInt32(val)
+					if err != nil {
+						return err
+					}
+
+					sDotGameIDVal = c
+					return nil
+				}(); err != nil {
+					return err
+				}
+				s.GameID.SetTo(sDotGameIDVal)
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"GameID\"")
+			}
+		default:
+			return nil
+		}
+		return nil
+	}); err != nil {
+		return errors.Wrap(err, "decode SubmissionFilter")
+	}
+	// Validate required fields.
+	var failures []validate.FieldError
+	for i, mask := range [1]uint8{
+		0b00000001,
+	} {
+		if result := (requiredBitSet[i] & mask) ^ mask; result != 0 {
+			// Mask only required fields and check equality to mask using XOR.
+			//
+			// If XOR result is not zero, result is not equal to expected, so some fields are missed.
+			// Bits of fields which would be set are actually bits of missed fields.
+			missed := bits.OnesCount8(result)
+			for bitN := 0; bitN < missed; bitN++ {
+				bitIdx := bits.TrailingZeros8(result)
+				fieldIdx := i*8 + bitIdx
+				var name string
+				if fieldIdx < len(uriFieldsNameOfSubmissionFilter) {
+					name = uriFieldsNameOfSubmissionFilter[fieldIdx]
+				} else {
+					name = strconv.Itoa(fieldIdx)
+				}
+				failures = append(failures, validate.FieldError{
+					Name:  name,
+					Error: validate.ErrFieldRequired,
+				})
+				// Reset bit.
+				result &^= 1 << bitIdx
+			}
+		}
+	}
+	if len(failures) > 0 {
+		return &validate.Error{Fields: failures}
+	}
+
+	return nil
+}

pkg/cmds/serve.go

@@ -2,26 +2,16 @@ package cmds
 
 import (
 	"fmt"
-	"net"
-	"net/http"
-
 	"git.itzana.me/strafesnet/go-grpc/auth"
-	"git.itzana.me/strafesnet/go-grpc/maps"
-	"git.itzana.me/strafesnet/go-grpc/maps_extended"
-	"git.itzana.me/strafesnet/go-grpc/users"
-	"git.itzana.me/strafesnet/go-grpc/validator"
 	"git.itzana.me/strafesnet/maps-service/pkg/api"
-	"git.itzana.me/strafesnet/maps-service/pkg/controller"
 	"git.itzana.me/strafesnet/maps-service/pkg/datastore/gormstore"
-	"git.itzana.me/strafesnet/maps-service/pkg/roblox"
 	"git.itzana.me/strafesnet/maps-service/pkg/service"
-	"git.itzana.me/strafesnet/maps-service/pkg/validator_controller"
-	"git.itzana.me/strafesnet/maps-service/pkg/web_api"
 	"github.com/nats-io/nats.go"
 	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
+	"net/http"
 )
 
 func NewServeCommand() *cli.Command {
@@ -72,36 +62,18 @@ func NewServeCommand() *cli.Command {
 				Value:   8080,
 				EnvVars: []string{"PORT"},
 			},
-			&cli.IntFlag{
-				Name:    "port-internal",
-				Usage:   "Port to listen on for internal api",
-				Value:   8081,
-				EnvVars: []string{"PORT_INTERNAL"},
-			},
 			&cli.StringFlag{
 				Name:    "auth-rpc-host",
 				Usage:   "Host of auth rpc",
 				EnvVars: []string{"AUTH_RPC_HOST"},
 				Value:   "auth-service:8090",
 			},
-			&cli.StringFlag{
-				Name:    "data-rpc-host",
-				Usage:   "Host of data rpc",
-				EnvVars: []string{"DATA_RPC_HOST"},
-				Value:   "data-service:9000",
-			},
 			&cli.StringFlag{
 				Name:    "nats-host",
 				Usage:   "Host of nats",
 				EnvVars: []string{"NATS_HOST"},
 				Value:   "nats:4222",
 			},
-			&cli.StringFlag{
-				Name:     "rbx-api-key",
-				Usage:    "API Key for downloading asset locations",
-				EnvVars:  []string{"RBX_API_KEY"},
-				Required: true,
-			},
 		},
 	}
 }
@@ -129,83 +101,23 @@ func serve(ctx *cli.Context) error {
 		log.WithError(err).Fatal("failed to add stream")
 	}
 
-	// connect to main game database
+	svc := &service.Service{
-	conn, err := grpc.Dial(ctx.String("data-rpc-host"), grpc.WithTransportCredentials(insecure.NewCredentials()))
+		DB:   db,
+		Nats: js,
+	}
+
+	conn, err := grpc.Dial(ctx.String("auth-rpc-host"), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		log.Fatal(err)
 	}
-	svc_inner := service.NewService(
+	sec := service.SecurityHandler{
-		db,
-		js,
-		maps.NewMapsServiceClient(conn),
-		users.NewUsersServiceClient(conn),
-	)
-
-	svc_external := web_api.NewService(
-		&svc_inner,
-		roblox.Client{
-			HttpClient: http.DefaultClient,
-			ApiKey: ctx.String("rbx-api-key"),
-		},
-	)
-
-	conn, err = grpc.Dial(ctx.String("auth-rpc-host"), grpc.WithTransportCredentials(insecure.NewCredentials()))
-	if err != nil {
-		log.Fatal(err)
-	}
-	sec := web_api.SecurityHandler{
 		Client: auth.NewAuthServiceClient(conn),
 	}
 
-	srv_external, err := api.NewServer(&svc_external, sec, api.WithPathPrefix("/v1"))
+	srv, err := api.NewServer(svc, sec, api.WithPathPrefix("/v1"))
 	if err != nil {
 		log.WithError(err).Fatal("failed to initialize api server")
 	}
 
-	grpcServer := grpc.NewServer()
+	return http.ListenAndServe(fmt.Sprintf(":%d", ctx.Int("port")), srv)
-
-	maps_controller := controller.NewMapsController(&svc_inner)
-	maps_extended.RegisterMapsServiceServer(grpcServer,&maps_controller)
-
-	mapfix_controller := validator_controller.NewMapfixesController(&svc_inner)
-	operation_controller := validator_controller.NewOperationsController(&svc_inner)
-	script_controller := validator_controller.NewScriptsController(&svc_inner)
-	script_policy_controller := validator_controller.NewScriptPolicyController(&svc_inner)
-	submission_controller := validator_controller.NewSubmissionsController(&svc_inner)
-
-	validator.RegisterValidatorMapfixServiceServer(grpcServer,&mapfix_controller)
-	validator.RegisterValidatorOperationServiceServer(grpcServer,&operation_controller)
-	validator.RegisterValidatorScriptServiceServer(grpcServer,&script_controller)
-	validator.RegisterValidatorScriptPolicyServiceServer(grpcServer,&script_policy_controller)
-	validator.RegisterValidatorSubmissionServiceServer(grpcServer,&submission_controller)
-
-	port := ctx.Int("port-internal")
-	lis, err := net.Listen("tcp", fmt.Sprintf(":%d", port))
-	if err != nil {
-		log.WithField("error", err).Fatalln("failed to net.Listen")
-	}
-	// Channel to collect errors
-	errChan := make(chan error, 2)
-
-	// First server
-	go func(errChan chan error) {
-		errChan <- grpcServer.Serve(lis)
-	}(errChan)
-
-	// Second server
-	go func(errChan chan error) {
-		errChan <- http.ListenAndServe(fmt.Sprintf(":%d", ctx.Int("port")), srv_external)
-	}(errChan)
-
-	// Wait for the first error or completion of both tasks
-	for i := 0; i < 2; i++ {
-		err := <-errChan
-		if err != nil {
-			fmt.Println("Exiting due to:", err)
-			return err
-		}
-	}
-	log.Println("Both servers have stopped.")
-
-	return nil
 }

pkg/controller/maps.go

@@ -1,197 +0,0 @@
-package controller
-
-import (
-	"context"
-	"errors"
-	"time"
-
-	"git.itzana.me/strafesnet/go-grpc/maps_extended"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service"
-)
-
-var (
-	PageError = errors.New("Pagination required")
-)
-
-type Maps struct {
-	*maps_extended.UnimplementedMapsServiceServer
-	inner *service.Service
-}
-
-func NewMapsController(
-	inner *service.Service,
-) Maps {
-	return Maps{
-		inner: inner,
-	}
-}
-
-func (svc *Maps) Create(ctx context.Context, request *maps_extended.MapCreate) (*maps_extended.MapId, error) {
-	id, err := svc.inner.CreateMap(ctx, model.Map{
-		ID:           request.ID,
-		DisplayName:  request.DisplayName,
-		Creator:      request.Creator,
-		GameID:       request.GameID,
-		Submitter:    request.Submitter,
-		Date:         time.Unix(request.Date, 0),
-		Thumbnail:    request.Thumbnail,
-		AssetVersion: request.AssetVersion,
-		LoadCount:    0,
-		Modes:        request.Modes,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return &maps_extended.MapId{
-		ID: id,
-	}, nil
-}
-
-func (svc *Maps) Delete(ctx context.Context, request *maps_extended.MapId) (*maps_extended.NullResponse, error) {
-	err := svc.inner.DeleteMap(ctx, request.ID)
-	if err != nil {
-		return nil, err
-	}
-	return &maps_extended.NullResponse{}, nil
-}
-func (svc *Maps) Get(ctx context.Context, request *maps_extended.MapId) (*maps_extended.MapResponse, error) {
-	item, err := svc.inner.GetMap(ctx, request.ID)
-	if err != nil {
-		return nil, err
-	}
-
-	return &maps_extended.MapResponse{
-		ID:           item.ID,
-		DisplayName:  item.DisplayName,
-		Creator:      item.Creator,
-		GameID:       uint32(item.GameID),
-		Date:         item.Date.Unix(),
-		CreatedAt:    item.CreatedAt.Unix(),
-		UpdatedAt:    item.UpdatedAt.Unix(),
-		Submitter:    uint64(item.Submitter),
-		Thumbnail:    uint64(item.Thumbnail),
-		AssetVersion: uint64(item.AssetVersion),
-		LoadCount:    item.LoadCount,
-		Modes:        item.Modes,
-	}, nil
-}
-func (svc *Maps) GetList(ctx context.Context, request *maps_extended.MapIdList) (*maps_extended.MapList, error) {
-	items, err := svc.inner.GetMapList(ctx, request.ID)
-	if err != nil {
-		return nil, err
-	}
-
-	resp := maps_extended.MapList{}
-	resp.Maps = make([]*maps_extended.MapResponse, len(items))
-	for i, item := range items {
-		resp.Maps[i] = &maps_extended.MapResponse{
-			ID:           item.ID,
-			DisplayName:  item.DisplayName,
-			Creator:      item.Creator,
-			GameID:       uint32(item.GameID),
-			Date:         item.Date.Unix(),
-			CreatedAt:    item.CreatedAt.Unix(),
-			UpdatedAt:    item.UpdatedAt.Unix(),
-			Submitter:    uint64(item.Submitter),
-			Thumbnail:    uint64(item.Thumbnail),
-			AssetVersion: uint64(item.AssetVersion),
-			LoadCount:    item.LoadCount,
-			Modes:        item.Modes,
-		}
-	}
-
-	return &resp, nil
-}
-func (svc *Maps) List(ctx context.Context, request *maps_extended.ListRequest) (*maps_extended.MapList, error) {
-	if request.Page == nil {
-		return nil, PageError
-	}
-
-	filter := service.NewMapFilter()
-	if request.Filter != nil {
-		if request.Filter.DisplayName != nil {
-			filter.SetDisplayName(*request.Filter.DisplayName)
-		}
-		if request.Filter.Creator != nil {
-			filter.SetCreator(*request.Filter.Creator)
-		}
-		if request.Filter.GameID != nil {
-			filter.SetGameID(*request.Filter.GameID)
-		}
-		if request.Filter.Submitter != nil {
-			filter.SetSubmitter(*request.Filter.Submitter)
-		}
-	}
-
-	items, err := svc.inner.ListMaps(ctx, filter, model.Page{
-		Number: int32(request.Page.Number),
-		Size:   int32(request.Page.Size),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	resp := maps_extended.MapList{}
-	resp.Maps = make([]*maps_extended.MapResponse, len(items))
-	for i, item := range items {
-		resp.Maps[i] = &maps_extended.MapResponse{
-			ID:           item.ID,
-			DisplayName:  item.DisplayName,
-			Creator:      item.Creator,
-			GameID:       uint32(item.GameID),
-			Date:         item.Date.Unix(),
-			CreatedAt:    item.CreatedAt.Unix(),
-			UpdatedAt:    item.UpdatedAt.Unix(),
-			Submitter:    uint64(item.Submitter),
-			Thumbnail:    uint64(item.Thumbnail),
-			AssetVersion: uint64(item.AssetVersion),
-			LoadCount:    item.LoadCount,
-			Modes:        item.Modes,
-		}
-	}
-
-	return &resp, nil
-}
-func (svc *Maps) Update(ctx context.Context, request *maps_extended.MapUpdate) (*maps_extended.NullResponse, error) {
-	update := service.NewMapUpdate()
-	if request.DisplayName != nil {
-		update.SetDisplayName(*request.DisplayName)
-	}
-	if request.Creator != nil {
-		update.SetCreator(*request.Creator)
-	}
-	if request.GameID != nil {
-		update.SetGameID(*request.GameID)
-	}
-	if request.Date != nil {
-		update.SetDate(*request.Date)
-	}
-	if request.Submitter != nil {
-		update.SetSubmitter(*request.Submitter)
-	}
-	if request.Thumbnail != nil {
-		update.SetThumbnail(*request.Thumbnail)
-	}
-	if request.AssetVersion != nil {
-		update.SetAssetVersion(*request.AssetVersion)
-	}
-	if request.Modes != nil {
-		update.SetModes(*request.Modes)
-	}
-
-	err := svc.inner.UpdateMap(ctx, request.ID, update)
-	if err != nil {
-		return nil, err
-	}
-	return &maps_extended.NullResponse{}, nil
-}
-
-func (svc *Maps) IncrementLoadCount(ctx context.Context, request *maps_extended.MapId) (*maps_extended.NullResponse, error) {
-	err := svc.inner.IncrementMapLoadCount(ctx, request.ID)
-	if err != nil {
-		return nil, err
-	}
-	return &maps_extended.NullResponse{}, nil
-}

pkg/datastore/datastore.go

@@ -3,84 +3,29 @@ package datastore
 import (
 	"context"
 	"errors"
-	"time"
-
 	"git.itzana.me/strafesnet/maps-service/pkg/model"
 )
 
 var (
 	ErrNotExist        = errors.New("resource does not exist")
 	ErroNoRowsAffected = errors.New("query did not affect any rows")
-	ErrInvalidListSort = errors.New("invalid list sort parameter [1,2,3,4]")
-)
-
-type ListSort uint32
-const (
-	ListSortDisabled ListSort = 0
-	ListSortDisplayNameAscending ListSort = 1
-	ListSortDisplayNameDescending ListSort = 2
-	ListSortDateAscending ListSort = 3
-	ListSortDateDescending ListSort = 4
 )
 
 type Datastore interface {
-	AuditEvents() AuditEvents
-	Maps() Maps
-	Mapfixes() Mapfixes
-	Operations() Operations
 	Submissions() Submissions
 	Scripts() Scripts
 	ScriptPolicy() ScriptPolicy
 }
 
-type AuditEvents interface {
-	Get(ctx context.Context, id int64) (model.AuditEvent, error)
-	Create(ctx context.Context, smap model.AuditEvent) (model.AuditEvent, error)
-	Update(ctx context.Context, id int64, values OptionalMap) error
-	Delete(ctx context.Context, id int64) error
-	List(ctx context.Context, filters OptionalMap, page model.Page) ([]model.AuditEvent, error)
-}
-
-type Maps interface {
-	Get(ctx context.Context, id int64) (model.Map, error)
-	GetList(ctx context.Context, id []int64) ([]model.Map, error)
-	Create(ctx context.Context, smap model.Map) (model.Map, error)
-	Update(ctx context.Context, id int64, values OptionalMap) error
-	Delete(ctx context.Context, id int64) error
-	List(ctx context.Context, filters OptionalMap, page model.Page) ([]model.Map, error)
-	IncrementLoadCount(ctx context.Context, id int64) error
-}
-
-type Mapfixes interface {
-	Get(ctx context.Context, id int64) (model.Mapfix, error)
-	GetList(ctx context.Context, id []int64) ([]model.Mapfix, error)
-	Create(ctx context.Context, smap model.Mapfix) (model.Mapfix, error)
-	Update(ctx context.Context, id int64, values OptionalMap) error
-	IfStatusThenUpdate(ctx context.Context, id int64, statuses []model.MapfixStatus, values OptionalMap) error
-	IfStatusThenUpdateAndGet(ctx context.Context, id int64, statuses []model.MapfixStatus, values OptionalMap) (model.Mapfix, error)
-	Delete(ctx context.Context, id int64) error
-	List(ctx context.Context, filters OptionalMap, page model.Page, sort ListSort) ([]model.Mapfix, error)
-	ListWithTotal(ctx context.Context, filters OptionalMap, page model.Page, sort ListSort) (int64, []model.Mapfix, error)
-}
-
-type Operations interface {
-	Get(ctx context.Context, id int32) (model.Operation, error)
-	Create(ctx context.Context, smap model.Operation) (model.Operation, error)
-	Update(ctx context.Context, id int32, values OptionalMap) error
-	Delete(ctx context.Context, id int32) error
-	CountSince(ctx context.Context, owner int64, since time.Time) (int64, error)
-}
-
 type Submissions interface {
 	Get(ctx context.Context, id int64) (model.Submission, error)
 	GetList(ctx context.Context, id []int64) ([]model.Submission, error)
 	Create(ctx context.Context, smap model.Submission) (model.Submission, error)
 	Update(ctx context.Context, id int64, values OptionalMap) error
-	IfStatusThenUpdate(ctx context.Context, id int64, statuses []model.SubmissionStatus, values OptionalMap) error
+	IfStatusThenUpdate(ctx context.Context, id int64, statuses []model.Status, values OptionalMap) error
-	IfStatusThenUpdateAndGet(ctx context.Context, id int64, statuses []model.SubmissionStatus, values OptionalMap) (model.Submission, error)
+	IfStatusThenUpdateAndGet(ctx context.Context, id int64, statuses []model.Status, values OptionalMap) (model.Submission, error)
 	Delete(ctx context.Context, id int64) error
-	List(ctx context.Context, filters OptionalMap, page model.Page, sort ListSort) ([]model.Submission, error)
+	List(ctx context.Context, filters OptionalMap, page model.Page) ([]model.Submission, error)
-	ListWithTotal(ctx context.Context, filters OptionalMap, page model.Page, sort ListSort) (int64, []model.Submission, error)
 }
 
 type Scripts interface {
@@ -88,7 +33,6 @@ type Scripts interface {
 	Create(ctx context.Context, smap model.Script) (model.Script, error)
 	Update(ctx context.Context, id int64, values OptionalMap) error
 	Delete(ctx context.Context, id int64) error
-	List(ctx context.Context, filters OptionalMap, page model.Page) ([]model.Script, error)
 }
 
 type ScriptPolicy interface {
@@ -97,5 +41,4 @@ type ScriptPolicy interface {
 	Create(ctx context.Context, smap model.ScriptPolicy) (model.ScriptPolicy, error)
 	Update(ctx context.Context, id int64, values OptionalMap) error
 	Delete(ctx context.Context, id int64) error
-	List(ctx context.Context, filters OptionalMap, page model.Page) ([]model.ScriptPolicy, error)
 }

pkg/datastore/gormstore/audit_events.go

@@ -1,64 +0,0 @@
-package gormstore
-
-import (
-	"context"
-	"errors"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"gorm.io/gorm"
-)
-
-type AuditEvents struct {
-	db *gorm.DB
-}
-
-func (env *AuditEvents) Get(ctx context.Context, id int64) (model.AuditEvent, error) {
-	var mdl model.AuditEvent
-	if err := env.db.First(&mdl, id).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return mdl, datastore.ErrNotExist
-		}
-		return mdl, err
-	}
-	return mdl, nil
-}
-
-func (env *AuditEvents) Create(ctx context.Context, smap model.AuditEvent) (model.AuditEvent, error) {
-	if err := env.db.Create(&smap).Error; err != nil {
-		return smap, err
-	}
-
-	return smap, nil
-}
-
-func (env *AuditEvents) Update(ctx context.Context, id int64, values datastore.OptionalMap) error {
-	if err := env.db.Model(&model.AuditEvent{}).Where("id = ?", id).Updates(values.Map()).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return datastore.ErrNotExist
-		}
-		return err
-	}
-
-	return nil
-}
-
-func (env *AuditEvents) Delete(ctx context.Context, id int64) error {
-	if err := env.db.Delete(&model.AuditEvent{}, id).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return datastore.ErrNotExist
-		}
-		return err
-	}
-
-	return nil
-}
-
-func (env *AuditEvents) List(ctx context.Context, filters datastore.OptionalMap, page model.Page) ([]model.AuditEvent, error) {
-	var events []model.AuditEvent
-	if err := env.db.Where(filters.Map()).Order("id ASC").Offset(int((page.Number - 1) * page.Size)).Limit(int(page.Size)).Find(&events).Error; err != nil {
-		return nil, err
-	}
-
-	return events, nil
-}

pkg/datastore/gormstore/db.go

@@ -31,10 +31,6 @@ func New(ctx *cli.Context) (datastore.Datastore, error) {
 
 	if ctx.Bool("migrate") {
 		if err := db.AutoMigrate(
-			&model.AuditEvent{},
-			&model.Map{},
-			&model.Mapfix{},
-			&model.Operation{},
 			&model.Submission{},
 			&model.Script{},
 			&model.ScriptPolicy{},

pkg/datastore/gormstore/gormstore.go

@@ -9,22 +9,6 @@ type Gormstore struct {
 	db *gorm.DB
 }
 
-func (g Gormstore) AuditEvents() datastore.AuditEvents {
-	return &AuditEvents{db: g.db}
-}
-
-func (g Gormstore) Maps() datastore.Maps {
-	return &Maps{db: g.db}
-}
-
-func (g Gormstore) Mapfixes() datastore.Mapfixes {
-	return &Mapfixes{db: g.db}
-}
-
-func (g Gormstore) Operations() datastore.Operations {
-	return &Operations{db: g.db}
-}
-
 func (g Gormstore) Submissions() datastore.Submissions {
 	return &Submissions{db: g.db}
 }

pkg/datastore/gormstore/mapfixes.go

@@ -1,153 +0,0 @@
-package gormstore
-
-import (
-	"context"
-	"errors"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
-)
-
-type Mapfixes struct {
-	db *gorm.DB
-}
-
-func (env *Mapfixes) Get(ctx context.Context, id int64) (model.Mapfix, error) {
-	var mapfix model.Mapfix
-	if err := env.db.First(&mapfix, id).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return mapfix, datastore.ErrNotExist
-		}
-		return mapfix, err
-	}
-	return mapfix, nil
-}
-
-func (env *Mapfixes) GetList(ctx context.Context, id []int64) ([]model.Mapfix, error) {
-	var mapList []model.Mapfix
-	if err := env.db.Find(&mapList, "id IN ?", id).Error; err != nil {
-		return mapList, err
-	}
-
-	return mapList, nil
-}
-
-func (env *Mapfixes) Create(ctx context.Context, smap model.Mapfix) (model.Mapfix, error) {
-	if err := env.db.Create(&smap).Error; err != nil {
-		return smap, err
-	}
-
-	return smap, nil
-}
-
-func (env *Mapfixes) Update(ctx context.Context, id int64, values datastore.OptionalMap) error {
-	if err := env.db.Model(&model.Mapfix{}).Where("id = ?", id).Updates(values.Map()).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return datastore.ErrNotExist
-		}
-		return err
-	}
-
-	return nil
-}
-
-// the update can only occur if the status matches one of the provided values.
-func (env *Mapfixes) IfStatusThenUpdate(ctx context.Context, id int64, statuses []model.MapfixStatus, values datastore.OptionalMap) error {
-	result := env.db.Model(&model.Mapfix{}).Where("id = ?", id).Where("status_id IN ?", statuses).Updates(values.Map())
-	if result.Error != nil {
-		if result.Error == gorm.ErrRecordNotFound {
-			return datastore.ErrNotExist
-		}
-		return result.Error
-	}
-
-	if result.RowsAffected == 0 {
-		return datastore.ErroNoRowsAffected
-	}
-
-	return nil
-}
-
-// the update can only occur if the status matches one of the provided values.
-// returns the updated value
-func (env *Mapfixes) IfStatusThenUpdateAndGet(ctx context.Context, id int64, statuses []model.MapfixStatus, values datastore.OptionalMap) (model.Mapfix, error) {
-	var mapfix model.Mapfix
-	result := env.db.Model(&mapfix).
-		Clauses(clause.Returning{}).
-		Where("id = ?", id).
-		Where("status_id IN ?", statuses).
-		Updates(values.Map())
-	if result.Error != nil {
-		if result.Error == gorm.ErrRecordNotFound {
-			return mapfix, datastore.ErrNotExist
-		}
-		return mapfix, result.Error
-	}
-
-	if result.RowsAffected == 0 {
-		return mapfix, datastore.ErroNoRowsAffected
-	}
-
-	return mapfix, nil
-}
-
-func (env *Mapfixes) Delete(ctx context.Context, id int64) error {
-	if err := env.db.Delete(&model.Mapfix{}, id).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return datastore.ErrNotExist
-		}
-		return err
-	}
-
-	return nil
-}
-
-func (env *Mapfixes) List(ctx context.Context, filters datastore.OptionalMap, page model.Page, sort datastore.ListSort) ([]model.Mapfix, error) {
-	var maps []model.Mapfix
-
-	db := env.db
-
-	switch sort {
-	case datastore.ListSortDisabled:
-		// No sort
-		break
-	case datastore.ListSortDisplayNameAscending:
-		db=db.Order("display_name ASC")
-		break
-	case datastore.ListSortDisplayNameDescending:
-		db=db.Order("display_name DESC")
-		break
-	case datastore.ListSortDateAscending:
-		db=db.Order("created_at ASC")
-		break
-	case datastore.ListSortDateDescending:
-		db=db.Order("created_at DESC")
-		break
-	default:
-		return nil, datastore.ErrInvalidListSort
-	}
-
-	if err := db.Where(filters.Map()).Offset(int((page.Number - 1) * page.Size)).Limit(int(page.Size)).Find(&maps).Error; err != nil {
-		return nil, err
-	}
-
-	return maps, nil
-}
-
-func (env *Mapfixes) ListWithTotal(ctx context.Context, filters datastore.OptionalMap, page model.Page, sort datastore.ListSort) (int64, []model.Mapfix, error) {
-	// grab page items
-	maps, err := env.List(ctx, filters, page, sort)
-	if err != nil{
-		return 0, nil, err
-	}
-
-	// count total with filters
-	var total int64
-	if err := env.db.Model(&model.Mapfix{}).Where(filters.Map()).Count(&total).Error; err != nil {
-		return 0, nil, err
-	}
-
-	return total, maps, nil
-}

pkg/datastore/gormstore/maps.go

@@ -1,84 +0,0 @@
-package gormstore
-
-import (
-	"context"
-	"errors"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"gorm.io/gorm"
-)
-
-type Maps struct {
-	db *gorm.DB
-}
-
-func (env *Maps) Get(ctx context.Context, id int64) (model.Map, error) {
-	var mdl model.Map
-	if err := env.db.First(&mdl, id).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return mdl, datastore.ErrNotExist
-		}
-		return mdl, err
-	}
-	return mdl, nil
-}
-
-func (env *Maps) GetList(ctx context.Context, id []int64) ([]model.Map, error) {
-	var mapList []model.Map
-	if err := env.db.Find(&mapList, "id IN ?", id).Error; err != nil {
-		return mapList, err
-	}
-
-	return mapList, nil
-}
-
-func (env *Maps) Create(ctx context.Context, smap model.Map) (model.Map, error) {
-	if err := env.db.Create(&smap).Error; err != nil {
-		return smap, err
-	}
-
-	return smap, nil
-}
-
-func (env *Maps) Update(ctx context.Context, id int64, values datastore.OptionalMap) error {
-	if err := env.db.Model(&model.Map{}).Where("id = ?", id).Updates(values.Map()).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return datastore.ErrNotExist
-		}
-		return err
-	}
-
-	return nil
-}
-
-func (env *Maps) IncrementLoadCount(ctx context.Context, id int64) error {
-	if err := env.db.Model(&model.Map{}).Where("id = ?", id).UpdateColumn("load_count", gorm.Expr("load_count + ?", 1)).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return datastore.ErrNotExist
-		}
-		return err
-	}
-
-	return nil
-}
-
-func (env *Maps) Delete(ctx context.Context, id int64) error {
-	if err := env.db.Delete(&model.Map{}, id).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return datastore.ErrNotExist
-		}
-		return err
-	}
-
-	return nil
-}
-
-func (env *Maps) List(ctx context.Context, filters datastore.OptionalMap, page model.Page) ([]model.Map, error) {
-	var events []model.Map
-	if err := env.db.Where(filters.Map()).Offset(int((page.Number - 1) * page.Size)).Limit(int(page.Size)).Find(&events).Error; err != nil {
-		return nil, err
-	}
-
-	return events, nil
-}

pkg/datastore/gormstore/operations.go

@@ -1,65 +0,0 @@
-package gormstore
-
-import (
-	"context"
-	"errors"
-	"time"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"gorm.io/gorm"
-)
-
-type Operations struct {
-	db *gorm.DB
-}
-
-func (env *Operations) Get(ctx context.Context, id int32) (model.Operation, error) {
-	var operation model.Operation
-	if err := env.db.First(&operation, id).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return operation, datastore.ErrNotExist
-		}
-		return operation, err
-	}
-	return operation, nil
-}
-
-func (env *Operations) Create(ctx context.Context, smap model.Operation) (model.Operation, error) {
-	if err := env.db.Create(&smap).Error; err != nil {
-		return smap, err
-	}
-
-	return smap, nil
-}
-
-func (env *Operations) Update(ctx context.Context, id int32, values datastore.OptionalMap) error {
-	if err := env.db.Model(&model.Operation{}).Where("id = ?", id).Updates(values.Map()).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return datastore.ErrNotExist
-		}
-		return err
-	}
-
-	return nil
-}
-
-func (env *Operations) Delete(ctx context.Context, id int32) error {
-	if err := env.db.Delete(&model.Operation{}, id).Error; err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return datastore.ErrNotExist
-		}
-		return err
-	}
-
-	return nil
-}
-
-func (env *Operations) CountSince(ctx context.Context, owner int64, since time.Time) (int64, error) {
-	var count int64
-	if err := env.db.Model(&model.Operation{}).Where("owner = ? AND created_at > ?",owner,since).Count(&count).Error; err != nil {
-		return count, err
-	}
-
-	return count, nil
-}

pkg/datastore/gormstore/script_policy.go

@@ -19,18 +19,16 @@ func (env *ScriptPolicy) Get(ctx context.Context, id int64) (model.ScriptPolicy,
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return mdl, datastore.ErrNotExist
 		}
-		return mdl, err
 	}
 	return mdl, nil
 }
 
 func (env *ScriptPolicy) GetFromHash(ctx context.Context, hash uint64) (model.ScriptPolicy, error) {
 	var mdl model.ScriptPolicy
-	if err := env.db.Take(&mdl,"from_script_hash = ?", hash).Error; err != nil {
+	if err := env.db.Model(&model.ScriptPolicy{}).Where("hash = ?", hash).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return mdl, datastore.ErrNotExist
 		}
-		return mdl, err
 	}
 	return mdl, nil
 }
@@ -64,12 +62,3 @@ func (env *ScriptPolicy) Delete(ctx context.Context, id int64) error {
 
 	return nil
 }
-
-func (env *ScriptPolicy) List(ctx context.Context, filters datastore.OptionalMap, page model.Page) ([]model.ScriptPolicy, error) {
-	var maps []model.ScriptPolicy
-	if err := env.db.Where(filters.Map()).Offset(int((page.Number - 1) * page.Size)).Limit(int(page.Size)).Find(&maps).Error; err != nil {
-		return nil, err
-	}
-
-	return maps, nil
-}

pkg/datastore/gormstore/scripts.go

@@ -19,7 +19,6 @@ func (env *Scripts) Get(ctx context.Context, id int64) (model.Script, error) {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return mdl, datastore.ErrNotExist
 		}
-		return mdl, err
 	}
 	return mdl, nil
 }
@@ -53,7 +52,7 @@ func (env *Scripts) Update(ctx context.Context, id int64, values datastore.Optio
 }
 
 // the update can only occur if the status matches one of the provided values.
-func (env *Scripts) IfStatusThenUpdate(ctx context.Context, id int64, statuses []model.SubmissionStatus, values datastore.OptionalMap) error {
+func (env *Scripts) IfStatusThenUpdate(ctx context.Context, id int64, statuses []model.Status, values datastore.OptionalMap) error {
 	if err := env.db.Model(&model.Script{}).Where("id = ?", id).Where("status IN ?", statuses).Updates(values.Map()).Error; err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return datastore.ErrNotExist

pkg/datastore/gormstore/submissions.go

@@ -20,7 +20,6 @@ func (env *Submissions) Get(ctx context.Context, id int64) (model.Submission, er
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return submission, datastore.ErrNotExist
 		}
-		return submission, err
 	}
 	return submission, nil
 }
@@ -54,17 +53,12 @@ func (env *Submissions) Update(ctx context.Context, id int64, values datastore.O
 }
 
 // the update can only occur if the status matches one of the provided values.
-func (env *Submissions) IfStatusThenUpdate(ctx context.Context, id int64, statuses []model.SubmissionStatus, values datastore.OptionalMap) error {
+func (env *Submissions) IfStatusThenUpdate(ctx context.Context, id int64, statuses []model.Status, values datastore.OptionalMap) error {
-	result := env.db.Model(&model.Submission{}).Where("id = ?", id).Where("status_id IN ?", statuses).Updates(values.Map())
+	if err := env.db.Model(&model.Submission{}).Where("id = ?", id).Where("status_id IN ?", statuses).Updates(values.Map()).Error; err != nil {
-	if result.Error != nil {
+		if err == gorm.ErrRecordNotFound {
-		if result.Error == gorm.ErrRecordNotFound {
 			return datastore.ErrNotExist
 		}
-		return result.Error
+		return err
-	}
-
-	if result.RowsAffected == 0 {
-		return datastore.ErroNoRowsAffected
 	}
 
 	return nil
@@ -72,7 +66,7 @@ func (env *Submissions) IfStatusThenUpdate(ctx context.Context, id int64, status
 
 // the update can only occur if the status matches one of the provided values.
 // returns the updated value
-func (env *Submissions) IfStatusThenUpdateAndGet(ctx context.Context, id int64, statuses []model.SubmissionStatus, values datastore.OptionalMap) (model.Submission, error) {
+func (env *Submissions) IfStatusThenUpdateAndGet(ctx context.Context, id int64, statuses []model.Status, values datastore.OptionalMap) (model.Submission, error) {
 	var submission model.Submission
 	result := env.db.Model(&submission).
 		Clauses(clause.Returning{}).
@@ -104,50 +98,11 @@ func (env *Submissions) Delete(ctx context.Context, id int64) error {
 	return nil
 }
 
-func (env *Submissions) List(ctx context.Context, filters datastore.OptionalMap, page model.Page, sort datastore.ListSort) ([]model.Submission, error) {
+func (env *Submissions) List(ctx context.Context, filters datastore.OptionalMap, page model.Page) ([]model.Submission, error) {
 	var maps []model.Submission
-
+	if err := env.db.Where(filters.Map()).Offset(int((page.Number - 1) * page.Size)).Limit(int(page.Size)).Find(&maps).Error; err != nil {
-	db := env.db
-
-	switch sort {
-	case datastore.ListSortDisabled:
-		// No sort
-		break
-	case datastore.ListSortDisplayNameAscending:
-		db=db.Order("display_name ASC")
-		break
-	case datastore.ListSortDisplayNameDescending:
-		db=db.Order("display_name DESC")
-		break
-	case datastore.ListSortDateAscending:
-		db=db.Order("created_at ASC")
-		break
-	case datastore.ListSortDateDescending:
-		db=db.Order("created_at DESC")
-		break
-	default:
-		return nil, datastore.ErrInvalidListSort
-	}
-
-	if err := db.Where(filters.Map()).Offset(int((page.Number - 1) * page.Size)).Limit(int(page.Size)).Find(&maps).Error; err != nil {
 		return nil, err
 	}
 
 	return maps, nil
 }
-
-func (env *Submissions) ListWithTotal(ctx context.Context, filters datastore.OptionalMap, page model.Page, sort datastore.ListSort) (int64, []model.Submission, error) {
-	// grab page items
-	maps, err := env.List(ctx, filters, page, sort)
-	if err != nil{
-		return 0, nil, err
-	}
-
-	// count total with filters
-	var total int64
-	if err := env.db.Model(&model.Submission{}).Where(filters.Map()).Count(&total).Error; err != nil {
-		return 0, nil, err
-	}
-
-	return total, maps, nil
-}

pkg/model/audit_event.go

@@ -1,75 +0,0 @@
-package model
-
-import (
-	"encoding/json"
-	"math"
-	"time"
-)
-
-const ValidatorUserID uint64 = uint64(math.MaxInt64)
-
-type AuditEventType int32
-
-// User clicked "Submit", "Accept" etc
-const AuditEventTypeAction    AuditEventType = 0
-type AuditEventDataAction struct {
-	TargetStatus uint32 `json:"target_status"`
-}
-
-// User wrote a comment
-const AuditEventTypeComment   AuditEventType = 1
-type AuditEventDataComment struct {
-	Comment string `json:"comment"`
-}
-
-// User changed Model
-const AuditEventTypeChangeModel AuditEventType = 2
-type AuditEventDataChangeModel struct {
-	OldModelID      uint64 `json:"old_model_id"`
-	OldModelVersion uint64 `json:"old_model_version"`
-	NewModelID      uint64 `json:"new_model_id"`
-	NewModelVersion uint64 `json:"new_model_version"`
-}
-// Validator validates model
-const AuditEventTypeChangeValidatedModel AuditEventType = 3
-type AuditEventDataChangeValidatedModel struct {
-	ValidatedModelID      uint64 `json:"validated_model_id"`
-	ValidatedModelVersion uint64 `json:"validated_model_version"`
-}
-
-// User changed DisplayName / Creator
-const AuditEventTypeChangeDisplayName AuditEventType = 4
-const AuditEventTypeChangeCreator AuditEventType = 5
-type AuditEventDataChangeName struct {
-	OldName string `json:"old_name"`
-	NewName string `json:"new_name"`
-}
-
-// Validator had an error
-const AuditEventTypeError   AuditEventType = 6
-type AuditEventDataError struct {
-	Error string `json:"error"`
-}
-
-type Check struct {
-	Name    string `json:"name"`
-	Summary string `json:"summary"`
-	Passed  bool   `json:"passed"`
-}
-
-// Validator map checks details
-const AuditEventTypeCheckList AuditEventType = 7
-
-type AuditEventDataCheckList struct {
-	CheckList []Check `json:"check_list"`
-}
-
-type AuditEvent struct {
-	ID           int64 `gorm:"primaryKey"`
-	CreatedAt    time.Time
-	User         uint64
-	ResourceType ResourceType // is this a submission or is it a mapfix
-	ResourceID   int64 // submission / mapfix / map ID
-	EventType    AuditEventType
-	EventData    json.RawMessage `gorm:"type:jsonb"`
-}

pkg/model/map.go

@@ -1,18 +0,0 @@
-package model
-
-import "time"
-
-type Map struct {
-	ID           int64
-	DisplayName  string
-	Creator      string
-	GameID       uint32
-	Date         time.Time // Release date
-	CreatedAt    time.Time
-	UpdatedAt    time.Time
-	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)
-}

pkg/model/mapfix.go

@@ -1,43 +0,0 @@
-package model
-
-import "time"
-
-type MapfixStatus int32
-
-const (
-	// Phase: Creation
-	MapfixStatusUnderConstruction   MapfixStatus = 0
-	MapfixStatusChangesRequested    MapfixStatus = 1
-
-	// Phase: Review
-	MapfixStatusSubmitting          MapfixStatus = 2
-	MapfixStatusSubmitted           MapfixStatus = 3
-
-	// Phase: Testing
-	MapfixStatusAcceptedUnvalidated MapfixStatus = 4 // pending script review, can re-trigger validation
-	MapfixStatusValidating          MapfixStatus = 5
-	MapfixStatusValidated           MapfixStatus = 6
-	MapfixStatusUploading           MapfixStatus = 7
-
-	// Phase: Final MapfixStatus
-	MapfixStatusUploaded            MapfixStatus = 8 // uploaded to the group, but pending release
-	MapfixStatusRejected            MapfixStatus = 9
-)
-
-type Mapfix struct {
-	ID            int64 `gorm:"primaryKey"`
-	DisplayName   string
-	Creator       string
-	GameID        uint32
-	CreatedAt     time.Time
-	UpdatedAt     time.Time
-	Submitter     uint64 // UserID
-	AssetID       uint64
-	AssetVersion  uint64
-	ValidatedAssetID       uint64
-	ValidatedAssetVersion  uint64
-	Completed     bool   // Has this version of the map been completed at least once on maptest
-	TargetAssetID uint64 // where to upload map fix.  if the TargetAssetID is 0, it's a new map.
-	StatusID      MapfixStatus
-	Description   string // mapfix description
-}

pkg/model/nats.go

@@ -5,62 +5,27 @@ package model
 
 // Requests are sent from maps-service to validator
 
-type CreateSubmissionRequest struct {
+type ValidateRequest struct {
-	// operation_id is passed back in the response message
-	OperationID    int32
-	ModelID       uint64
-	DisplayName   string
-	Creator       string
-	GameID        uint32
-	Status        uint32
-	Roles         uint32
-}
-
-type CreateMapfixRequest struct {
-	OperationID    int32
-	ModelID       uint64
-	TargetAssetID uint64
-	Description   string
-}
-
-
-type CheckSubmissionRequest struct{
-	SubmissionID int64
-	ModelID      uint64
-	SkipChecks   bool
-}
-
-type CheckMapfixRequest struct{
-	MapfixID   int64
-	ModelID    uint64
-	SkipChecks bool
-}
-
-type ValidateSubmissionRequest struct {
 	// submission_id is passed back in the response message
-	SubmissionID       int64
+	SubmissionID     int64
-	ModelID           uint64
+	ModelID          uint64
-	ModelVersion      uint64
+	ModelVersion     uint64
-	ValidatedModelID *uint64 // optional value
+	ValidatedModelID uint64 // optional value
-}
-
-type ValidateMapfixRequest struct {
-	MapfixID           int64
-	ModelID           uint64
-	ModelVersion      uint64
-	ValidatedModelID *uint64 // optional value
 }
 
 // Create a new map
-type UploadSubmissionRequest struct {
+type PublishNewRequest struct {
-	SubmissionID  int64
+	SubmissionID int64
 	ModelID      uint64
 	ModelVersion uint64
-	ModelName    string
+	Creator      string
+	DisplayName  string
+	GameID       uint32
+	//games HashSet<GameID>
 }
 
-type UploadMapfixRequest struct {
+type PublishFixRequest struct {
-	MapfixID       int64
+	SubmissionID  int64
 	ModelID       uint64
 	ModelVersion  uint64
 	TargetAssetID uint64

pkg/model/operation.go

@@ -1,19 +0,0 @@
-package model
-
-import "time"
-
-type OperationStatus int32
-const (
-	OperationStatusCreated   OperationStatus = 0
-	OperationStatusCompleted OperationStatus = 1
-	OperationStatusFailed    OperationStatus = 2
-)
-
-type Operation struct {
-	ID            int32 `gorm:"primaryKey"`
-	CreatedAt     time.Time
-	Owner         uint64 // UserID
-	StatusID      OperationStatus
-	StatusMessage string
-	Path          string // redirect to view completed operation e.g. "/mapfixes/4"
-}

pkg/model/policy.go

@@ -5,11 +5,10 @@ import "time"
 type Policy int32
 
 const (
-	ScriptPolicyNone    Policy = 0 // not yet reviewed
+	ScriptPolicyAllowed Policy = 0
-	ScriptPolicyAllowed Policy = 1
+	ScriptPolicyBlocked Policy = 1
-	ScriptPolicyBlocked Policy = 2
+	ScriptPolicyDelete  Policy = 2
-	ScriptPolicyDelete  Policy = 3
+	ScriptPolicyReplace Policy = 3
-	ScriptPolicyReplace Policy = 4
 )
 
 type ScriptPolicy struct {
@@ -17,7 +16,7 @@ type ScriptPolicy struct {
 	// Hash of the source code that leads to this policy.
 	// If this is a replacement mapping, the original source may not be pointed to by any policy.
 	// The original source should still exist in the scripts table, which can be located by the same hash.
-	FromScriptHash int64 // postgres does not support unsigned integers, so we have to pretend
+	FromScriptHash uint64
 	// The ID of the replacement source (ScriptPolicyReplace)
 	// or verbatim source (ScriptPolicyAllowed)
 	// or 0 (other)

pkg/model/resource.go

@@ -1,13 +0,0 @@
-package model
-
-type ResourceType int32
-const (
-	ResourceUnknown    ResourceType = 0
-	ResourceMapfix     ResourceType = 1
-	ResourceSubmission ResourceType = 2
-)
-
-type Resource struct{
-	ID int64
-	Type ResourceType
-}

pkg/model/roles.go

@@ -1,33 +0,0 @@
-package model
-
-// Submissions roles bitflag
-type Roles int32
-var (
-	RolesSubmissionUpload Roles = 1<<6
-	RolesSubmissionReview Roles = 1<<5
-	RolesSubmissionRelease Roles = 1<<4
-	RolesScriptWrite Roles = 1<<3
-	RolesMapfixUpload Roles = 1<<2
-	RolesMapfixReview Roles = 1<<1
-	RolesMapDownload Roles = 1<<0
-	RolesEmpty Roles = 0
-)
-
-// StrafesNET group roles
-type GroupRole int32
-var (
-	// has ScriptWrite
-	RoleQuat GroupRole = 255
-	RoleItzaname GroupRole = 254
-	RoleStagingDeveloper GroupRole = 240
-	RolesAll Roles = ^RolesEmpty
-	// has SubmissionUpload
-	RoleMapAdmin GroupRole = 128
-	RolesMapAdmin Roles = RolesSubmissionRelease|RolesSubmissionUpload|RolesSubmissionReview|RolesMapCouncil
-	// has MapfixReview
-	RoleMapCouncil GroupRole = 64
-	RolesMapCouncil Roles = RolesMapfixReview|RolesMapfixUpload|RolesMapAccess
-	// access to downloading maps
-	RoleMapAccess GroupRole = 32
-	RolesMapAccess Roles = RolesMapDownload
-)

pkg/model/script.go

@@ -1,35 +1,12 @@
 package model
 
-import (
+import "time"
-	"fmt"
-	"strconv"
-	"time"
-
-	"github.com/dchest/siphash"
-)
-
-// compute the hash of a source code string
-func HashSource(source string) uint64{
-	return siphash.Hash(0, 0, []byte(source))
-}
-
-// format a hash value as a hexidecimal string
-func HashFormat(hash uint64) string{
-	return fmt.Sprintf("%016x", hash)
-}
-
-// parse a hexidecimal hash string
-func HashParse(hash string) (uint64, error){
-	return strconv.ParseUint(hash, 16, 64)
-}
 
 type Script struct {
 	ID           int64 `gorm:"primaryKey"`
-	Name         string
+	Hash         uint64
-	Hash         int64 // postgres does not support unsigned integers, so we have to pretend
 	Source       string
-	ResourceType ResourceType // is this a submission or is it a mapfix
+	SubmissionID int64 // which submission did this script first appear in
-	ResourceID   int64 // which submission / mapfix did this script first appear in
 	CreatedAt    time.Time
 	UpdatedAt    time.Time
 }

pkg/model/submission.go

@@ -2,42 +2,33 @@ package model
 
 import "time"
 
-type SubmissionStatus int32
+type Status int32
 
 const (
-	// Phase: Creation
+	StatusPublished Status = 8
-	SubmissionStatusUnderConstruction   SubmissionStatus = 0
+	StatusRejected  Status = 7
-	SubmissionStatusChangesRequested    SubmissionStatus = 1
 
-	// Phase: Review
+	StatusPublishing Status = 6
-	SubmissionStatusSubmitting          SubmissionStatus = 2
+	StatusValidated  Status = 5
-	SubmissionStatusSubmitted           SubmissionStatus = 3
+	StatusValidating Status = 4
+	StatusAccepted   Status = 3
 
-	// Phase: Testing
+	StatusChangesRequested  Status = 2
-	SubmissionStatusAcceptedUnvalidated SubmissionStatus = 4 // pending script review, can re-trigger validation
+	StatusSubmitted         Status = 1
-	SubmissionStatusValidating          SubmissionStatus = 5
+	StatusUnderConstruction Status = 0
-	SubmissionStatusValidated           SubmissionStatus = 6
-	SubmissionStatusUploading           SubmissionStatus = 7
-	SubmissionStatusUploaded            SubmissionStatus = 8 // uploaded to the group, but pending release
-
-	// Phase: Final SubmissionStatus
-	SubmissionStatusRejected            SubmissionStatus = 9
-	SubmissionStatusReleased            SubmissionStatus = 10
 )
 
 type Submission struct {
 	ID            int64 `gorm:"primaryKey"`
 	DisplayName   string
 	Creator       string
-	GameID        uint32
+	GameID        int32
 	CreatedAt     time.Time
 	UpdatedAt     time.Time
 	Submitter     uint64 // UserID
 	AssetID       uint64
 	AssetVersion  uint64
-	ValidatedAssetID       uint64
-	ValidatedAssetVersion  uint64
 	Completed     bool   // Has this version of the map been completed at least once on maptest
-	UploadedAssetID        uint64 // where to upload map fix.  if the TargetAssetID is 0, it's a new map.
+	TargetAssetID uint64 // where to upload map fix.  if the TargetAssetID is 0, it's a new map.
-	StatusID      SubmissionStatus
+	StatusID      Status
 }

pkg/roblox/asset_location.go

@@ -1,95 +0,0 @@
-package roblox
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-)
-
-type AssetMetadata struct {
-	MetadataType uint32 `json:"metadataType"`
-	Value        string `json:"value"`
-}
-
-// Struct equivalent to Rust's AssetLocationInfo
-type AssetLocationInfo struct {
-	Location       string          `json:"location"`
-	RequestId      string          `json:"requestId"`
-	IsArchived     bool            `json:"isArchived"`
-	AssetTypeId    uint32          `json:"assetTypeId"`
-	AssetMetadatas []AssetMetadata `json:"assetMetadatas"`
-	IsRecordable   bool            `json:"isRecordable"`
-}
-
-// Input struct for getAssetLocation
-type GetAssetLatestRequest struct {
-	AssetID uint64
-}
-
-// Custom error type if needed
-type GetError string
-
-func (e GetError) Error() string { return string(e) }
-
-// Example client with a Get method
-type Client struct {
-	HttpClient *http.Client
-	ApiKey     string
-}
-
-func (c *Client) GetAssetLocation(config GetAssetLatestRequest) (*AssetLocationInfo, error) {
-	rawURL := fmt.Sprintf("https://apis.roblox.com/asset-delivery-api/v1/assetId/%d", config.AssetID)
-	parsedURL, err := url.Parse(rawURL)
-	if err != nil {
-		return nil, GetError("ParseError: " + err.Error())
-	}
-
-	req, err := http.NewRequest("GET", parsedURL.String(), nil)
-	if err != nil {
-		return nil, GetError("RequestCreationError: " + err.Error())
-	}
-
-	req.Header.Set("x-api-key", c.ApiKey)
-
-	resp, err := c.HttpClient.Do(req)
-	if err != nil {
-		return nil, GetError("RequestError: " + err.Error())
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		return nil, GetError(fmt.Sprintf("ResponseError: status code %d", resp.StatusCode))
-	}
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, GetError("ReadBodyError: " + err.Error())
-	}
-
-	var info AssetLocationInfo
-	if err := json.Unmarshal(body, &info); err != nil {
-		return nil, GetError("JSONError: " + err.Error())
-	}
-
-	return &info, nil
-}
-
-func (c *Client) DownloadAsset(info *AssetLocationInfo) (io.Reader, error) {
-	req, err := http.NewRequest("GET", info.Location, nil)
-	if err != nil {
-		return nil, GetError("RequestCreationError: " + err.Error())
-	}
-
-	resp, err := c.HttpClient.Do(req)
-	if err != nil {
-		return nil, GetError("RequestError: " + err.Error())
-	}
-
-	if resp.StatusCode != http.StatusOK {
-		return nil, GetError(fmt.Sprintf("ResponseError: status code %d", resp.StatusCode))
-	}
-
-	return resp.Body, nil
-}

pkg/service/audit_events.go

@@ -1,238 +0,0 @@
-package service
-
-import (
-	"context"
-	"encoding/json"
-
-	"git.itzana.me/strafesnet/go-grpc/users"
-	"git.itzana.me/strafesnet/maps-service/pkg/api"
-	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-)
-
-func (svc *Service) ListAuditEvents(ctx context.Context, resource model.Resource, page model.Page) ([]api.AuditEvent, error){
-	filter := datastore.Optional()
-
-	filter.Add("resource_type", resource.Type)
-	filter.Add("resource_id", resource.ID)
-
-	items, err := svc.db.AuditEvents().List(ctx, filter, page)
-	if err != nil {
-		return nil, err
-	}
-
-	idMap := make(map[int64]bool)
-	for _, item := range items {
-		idMap[int64(item.User)] = true
-	}
-
-	var idList users.IdList
-	idList.ID = make([]int64,len(idMap))
-	for userId := range idMap {
-		idList.ID = append(idList.ID, userId)
-	}
-
-	userList, err := svc.users.GetList(ctx, &idList)
-	if err != nil {
-		return nil, err
-	}
-
-	userMap := make(map[int64]*users.UserResponse)
-	for _,user := range userList.Users {
-		userMap[user.ID] = user
-	}
-
-	var resp []api.AuditEvent
-	for _, item := range items {
-		EventData := api.AuditEventEventData{}
-		err = EventData.UnmarshalJSON(item.EventData)
-		if err != nil {
-			return nil, err
-		}
-		username := ""
-		if userMap[int64(item.User)] != nil {
-			username = userMap[int64(item.User)].Username
-		}
-		resp = append(resp, api.AuditEvent{
-			ID:           item.ID,
-			Date:         item.CreatedAt.Unix(),
-			User:         int64(item.User),
-			Username:     username,
-			ResourceType: int32(item.ResourceType),
-			ResourceID:   item.ResourceID,
-			EventType:    int32(item.EventType),
-			EventData:    EventData,
-		})
-	}
-
-	return resp, nil
-}
-
-func (svc *Service) CreateAuditEventAction(ctx context.Context, userId uint64, resource model.Resource, event_data model.AuditEventDataAction) error {
-	EventData, err := json.Marshal(event_data)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.db.AuditEvents().Create(ctx, model.AuditEvent{
-		ID:           0,
-		User:         userId,
-		ResourceType: resource.Type,
-		ResourceID:   resource.ID,
-		EventType:    model.AuditEventTypeAction,
-		EventData:    EventData,
-	})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (svc *Service) CreateAuditEventComment(ctx context.Context, userId uint64, resource model.Resource, event_data model.AuditEventDataComment) error {
-	EventData, err := json.Marshal(event_data)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.db.AuditEvents().Create(ctx, model.AuditEvent{
-		ID:           0,
-		User:         userId,
-		ResourceType: resource.Type,
-		ResourceID:   resource.ID,
-		EventType:    model.AuditEventTypeComment,
-		EventData:    EventData,
-	})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (svc *Service) CreateAuditEventChangeModel(ctx context.Context, userId uint64, resource model.Resource, event_data model.AuditEventDataChangeModel) error {
-	EventData, err := json.Marshal(event_data)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.db.AuditEvents().Create(ctx, model.AuditEvent{
-		ID:           0,
-		User:         userId,
-		ResourceType: resource.Type,
-		ResourceID:   resource.ID,
-		EventType:    model.AuditEventTypeChangeModel,
-		EventData:    EventData,
-	})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-
-func (svc *Service) CreateAuditEventChangeValidatedModel(ctx context.Context, userId uint64, resource model.Resource, event_data model.AuditEventDataChangeValidatedModel) error {
-	EventData, err := json.Marshal(event_data)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.db.AuditEvents().Create(ctx, model.AuditEvent{
-		ID:           0,
-		User:         userId,
-		ResourceType: resource.Type,
-		ResourceID:   resource.ID,
-		EventType:    model.AuditEventTypeChangeValidatedModel,
-		EventData:    EventData,
-	})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (svc *Service) CreateAuditEventError(ctx context.Context, userId uint64, resource model.Resource, event_data model.AuditEventDataError) error {
-	EventData, err := json.Marshal(event_data)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.db.AuditEvents().Create(ctx, model.AuditEvent{
-		ID:           0,
-		User:         userId,
-		ResourceType: resource.Type,
-		ResourceID:   resource.ID,
-		EventType:    model.AuditEventTypeError,
-		EventData:    EventData,
-	})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (svc *Service) CreateAuditEventCheckList(ctx context.Context, userId uint64, resource model.Resource, event_data model.AuditEventDataCheckList) error {
-	EventData, err := json.Marshal(event_data)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.db.AuditEvents().Create(ctx, model.AuditEvent{
-		ID:           0,
-		User:         userId,
-		ResourceType: resource.Type,
-		ResourceID:   resource.ID,
-		EventType:    model.AuditEventTypeCheckList,
-		EventData:    EventData,
-	})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (svc *Service) CreateAuditEventChangeDisplayName(ctx context.Context, userId uint64, resource model.Resource, event_data model.AuditEventDataChangeName) error {
-	EventData, err := json.Marshal(event_data)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.db.AuditEvents().Create(ctx, model.AuditEvent{
-		ID:           0,
-		User:         userId,
-		ResourceType: resource.Type,
-		ResourceID:   resource.ID,
-		EventType:    model.AuditEventTypeChangeDisplayName,
-		EventData:    EventData,
-	})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (svc *Service) CreateAuditEventChangeCreator(ctx context.Context, userId uint64, resource model.Resource, event_data model.AuditEventDataChangeName) error {
-	EventData, err := json.Marshal(event_data)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.db.AuditEvents().Create(ctx, model.AuditEvent{
-		ID:           0,
-		User:         userId,
-		ResourceType: resource.Type,
-		ResourceID:   resource.ID,
-		EventType:    model.AuditEventTypeChangeCreator,
-		EventData:    EventData,
-	})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

pkg/service/mapfixes.go

@@ -1,116 +0,0 @@
-package service
-
-import (
-	"context"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-)
-
-type MapfixUpdate datastore.OptionalMap
-
-func NewMapfixUpdate() MapfixUpdate {
-	update := datastore.Optional()
-	return MapfixUpdate(update)
-}
-
-func (update MapfixUpdate) SetDisplayName(display_name string) {
-	datastore.OptionalMap(update).Add("display_name", display_name)
-}
-func (update MapfixUpdate) SetCreator(creator string) {
-	datastore.OptionalMap(update).Add("creator", creator)
-}
-func (update MapfixUpdate) SetGameID(game_id uint32) {
-	datastore.OptionalMap(update).Add("game_id", game_id)
-}
-func (update MapfixUpdate) SetSubmitter(submitter uint64) {
-	datastore.OptionalMap(update).Add("submitter", submitter)
-}
-func (update MapfixUpdate) SetAssetID(asset_id uint64) {
-	datastore.OptionalMap(update).Add("asset_id", asset_id)
-}
-func (update MapfixUpdate) SetAssetVersion(asset_version uint64) {
-	datastore.OptionalMap(update).Add("asset_version", asset_version)
-}
-func (update MapfixUpdate) SetValidatedAssetID(validated_asset_id uint64) {
-	datastore.OptionalMap(update).Add("validated_asset_id", validated_asset_id)
-}
-func (update MapfixUpdate) SetValidatedAssetVersion(validated_asset_version uint64) {
-	datastore.OptionalMap(update).Add("validated_asset_version", validated_asset_version)
-}
-func (update MapfixUpdate) SetCompleted(completed bool) {
-	datastore.OptionalMap(update).Add("completed", completed)
-}
-func (update MapfixUpdate) SetTargetAssetID(target_asset_id uint64) {
-	datastore.OptionalMap(update).Add("target_asset_id", target_asset_id)
-}
-func (update MapfixUpdate) SetStatusID(status_id model.MapfixStatus) {
-	datastore.OptionalMap(update).Add("status_id", status_id)
-}
-func (update MapfixUpdate) SetDescription(description string) {
-	datastore.OptionalMap(update).Add("description", description)
-}
-
-type MapfixFilter datastore.OptionalMap
-
-func NewMapfixFilter(
-) MapfixFilter {
-	filter := datastore.Optional()
-	return MapfixFilter(filter)
-}
-func (update MapfixFilter) SetDisplayName(display_name string) {
-	datastore.OptionalMap(update).Add("display_name", display_name)
-}
-func (update MapfixFilter) SetCreator(creator string) {
-	datastore.OptionalMap(update).Add("creator", creator)
-}
-func (update MapfixFilter) SetGameID(game_id uint32) {
-	datastore.OptionalMap(update).Add("game_id", game_id)
-}
-func (update MapfixFilter) SetSubmitter(submitter uint64) {
-	datastore.OptionalMap(update).Add("submitter", submitter)
-}
-func (update MapfixFilter) SetAssetID(asset_id uint64) {
-	datastore.OptionalMap(update).Add("asset_id", asset_id)
-}
-func (update MapfixFilter) SetAssetVersion(asset_version uint64) {
-	datastore.OptionalMap(update).Add("asset_version", asset_version)
-}
-func (update MapfixFilter) SetTargetAssetID(target_asset_id uint64) {
-	datastore.OptionalMap(update).Add("target_asset_id", target_asset_id)
-}
-func (update MapfixFilter) SetStatuses(statuses []model.MapfixStatus) {
-	datastore.OptionalMap(update).Add("status_id", statuses)
-}
-
-func (svc *Service) CreateMapfix(ctx context.Context, script model.Mapfix) (model.Mapfix, error) {
-	return svc.db.Mapfixes().Create(ctx, script)
-}
-
-func (svc *Service) ListMapfixes(ctx context.Context, filter MapfixFilter, page model.Page, sort datastore.ListSort) ([]model.Mapfix, error) {
-	return svc.db.Mapfixes().List(ctx, datastore.OptionalMap(filter), page, sort)
-}
-
-func (svc *Service) ListMapfixesWithTotal(ctx context.Context, filter MapfixFilter, page model.Page, sort datastore.ListSort) (int64, []model.Mapfix, error) {
-	return svc.db.Mapfixes().ListWithTotal(ctx, datastore.OptionalMap(filter), page, sort)
-}
-
-func (svc *Service) DeleteMapfix(ctx context.Context, id int64) error {
-	return svc.db.Mapfixes().Delete(ctx, id)
-}
-
-func (svc *Service) GetMapfix(ctx context.Context, id int64) (model.Mapfix, error) {
-	return svc.db.Mapfixes().Get(ctx, id)
-}
-
-func (svc *Service) UpdateMapfix(ctx context.Context, id int64, pmap MapfixUpdate) error {
-	return svc.db.Mapfixes().Update(ctx, id, datastore.OptionalMap(pmap))
-}
-
-func (svc *Service) UpdateMapfixIfStatus(ctx context.Context, id int64, statuses []model.MapfixStatus, pmap MapfixUpdate) error {
-	return svc.db.Mapfixes().IfStatusThenUpdate(ctx, id, statuses, datastore.OptionalMap(pmap))
-}
-
-func (svc *Service) UpdateAndGetMapfixIfStatus(ctx context.Context, id int64, statuses []model.MapfixStatus, pmap MapfixUpdate) (model.Mapfix, error) {
-	return svc.db.Mapfixes().IfStatusThenUpdateAndGet(ctx, id, statuses, datastore.OptionalMap(pmap))
-}

pkg/service/maps.go

@@ -1,188 +0,0 @@
-package service
-
-import (
-	"context"
-	"time"
-
-	"git.itzana.me/strafesnet/go-grpc/maps"
-	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-)
-
-// Optional map used to update an object
-type MapUpdate datastore.OptionalMap
-
-func NewMapUpdate() MapUpdate {
-	update := datastore.Optional()
-	return MapUpdate(update)
-}
-
-func (update MapUpdate) SetDisplayName(display_name string) {
-	datastore.OptionalMap(update).Add("display_name", display_name)
-}
-func (update MapUpdate) SetCreator(creator string) {
-	datastore.OptionalMap(update).Add("creator", creator)
-}
-func (update MapUpdate) SetGameID(game_id uint32) {
-	datastore.OptionalMap(update).Add("game_id", game_id)
-}
-func (update MapUpdate) SetDate(date int64) {
-	datastore.OptionalMap(update).Add("date", date)
-}
-func (update MapUpdate) SetSubmitter(submitter uint64) {
-	datastore.OptionalMap(update).Add("submitter", submitter)
-}
-func (update MapUpdate) SetThumbnail(thumbnail uint64) {
-	datastore.OptionalMap(update).Add("thumbnail", thumbnail)
-}
-func (update MapUpdate) SetAssetVersion(asset_version uint64) {
-	datastore.OptionalMap(update).Add("asset_version", asset_version)
-}
-func (update MapUpdate) SetModes(modes uint32) {
-	datastore.OptionalMap(update).Add("modes", modes)
-}
-
-// getters
-func (update MapUpdate) GetDisplayName() (string, bool) {
-	value, ok := datastore.OptionalMap(update).Map()["display_name"].(string)
-	return value, ok
-}
-func (update MapUpdate) GetCreator() (string, bool) {
-	value, ok := datastore.OptionalMap(update).Map()["creator"].(string)
-	return value, ok
-}
-func (update MapUpdate) GetGameID() (uint32, bool) {
-	value, ok := datastore.OptionalMap(update).Map()["game_id"].(uint32)
-	return value, ok
-}
-func (update MapUpdate) GetDate() (int64, bool) {
-	value, ok := datastore.OptionalMap(update).Map()["date"].(int64)
-	return value, ok
-}
-
-// Optional map used to find matching objects
-type MapFilter datastore.OptionalMap
-
-func NewMapFilter(
-) MapFilter {
-	filter := datastore.Optional()
-	return MapFilter(filter)
-}
-func (update MapFilter) SetDisplayName(display_name string) {
-	datastore.OptionalMap(update).Add("display_name", display_name)
-}
-func (update MapFilter) SetCreator(creator string) {
-	datastore.OptionalMap(update).Add("creator", creator)
-}
-func (update MapFilter) SetGameID(game_id uint32) {
-	datastore.OptionalMap(update).Add("game_id", game_id)
-}
-func (update MapFilter) SetSubmitter(submitter uint64) {
-	datastore.OptionalMap(update).Add("submitter", submitter)
-}
-
-func (svc *Service) TEMP_DoMapsMigration(ctx context.Context) (error) {
-	// get all maps
-	maps, err := svc.maps.List(ctx, &maps.ListRequest{})
-	if err != nil {
-		return err
-	}
-	// create all maps
-	for _, item := range maps.Maps {
-		migrated := model.Map{
-			ID:           item.ID,
-			DisplayName:  item.DisplayName,
-			Creator:      item.Creator,
-			GameID:       uint32(item.GameID),
-			Date:         time.Unix(item.Date, 0),
-			// CreatedAt:    time.Time{},
-			// UpdatedAt:    time.Time{},
-			// Submitter:    0,
-			// Thumbnail:    0,
-			// AssetVersion: 0,
-			// LoadCount:    0,
-			// Modes:        0,
-		}
-		_, err := svc.db.Maps().Create(ctx, migrated)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-func (svc *Service) CreateMap(ctx context.Context, item model.Map) (int64, error) {
-	// 2 jobs:
-	// create map on maps-service
-	map_item, err := svc.db.Maps().Create(ctx, item)
-	if err != nil {
-		return 0, err
-	}
-	// 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:      &game_id,
-		Date:        &date,
-	})
-	if err != nil {
-		return 0, err
-	}
-
-	return map_item.ID, nil
-}
-
-func (svc *Service) ListMaps(ctx context.Context, filter MapFilter, page model.Page) ([]model.Map, error) {
-	return svc.db.Maps().List(ctx, datastore.OptionalMap(filter), page)
-}
-
-func (svc *Service) GetMapList(ctx context.Context, ids []int64) ([]model.Map, error) {
-	return svc.db.Maps().GetList(ctx, ids)
-}
-
-func (svc *Service) DeleteMap(ctx context.Context, id int64) error {
-	// Do not delete the "embedded" map, since it deletes times.
-	// _, err := svc.maps.Delete(ctx, &maps.IdMessage{ID: id})
-	return svc.db.Maps().Delete(ctx, id)
-}
-
-func (svc *Service) GetMap(ctx context.Context, id int64) (model.Map, error) {
-	return svc.db.Maps().Get(ctx, id)
-}
-
-func (svc *Service) UpdateMap(ctx context.Context, id int64, pmap MapUpdate) error {
-	// 2 jobs:
-	// update map on maps-service
-	err := svc.db.Maps().Update(ctx, id, datastore.OptionalMap(pmap))
-	if err != nil {
-		return err
-	}
-	// update map on data-service
-	update := maps.MapRequest{
-		ID: id,
-	}
-	if display_name, ok := pmap.GetDisplayName(); ok {
-		update.DisplayName = &display_name
-	}
-	if creator, ok := pmap.GetCreator(); ok {
-		update.Creator = &creator
-	}
-	if game_id, ok := pmap.GetGameID(); ok {
-		game_id_int32 := int32(game_id)
-		update.GameID = &game_id_int32
-	}
-	if date, ok := pmap.GetDate(); ok {
-		update.Date = &date
-	}
-	_, err = svc.maps.Update(ctx, &update)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (svc *Service) IncrementMapLoadCount(ctx context.Context, id int64) error {
-	return svc.db.Maps().IncrementLoadCount(ctx, id)
-}

pkg/service/nats_mapfix.go

@@ -1,114 +0,0 @@
-package service
-
-import (
-	"encoding/json"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-)
-
-func (svc *Service) NatsCreateMapfix(
-	OperationID int32,
-	ModelID uint64,
-	TargetAssetID uint64,
-	Description string,
-) error {
-	create_request := model.CreateMapfixRequest{
-		OperationID:   OperationID,
-		ModelID:       ModelID,
-		TargetAssetID: TargetAssetID,
-		Description:   Description,
-	}
-
-	j, err := json.Marshal(create_request)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.nats.Publish("maptest.mapfixes.create", []byte(j))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (svc *Service) NatsCheckMapfix(
-	MapfixID   int64,
-	ModelID    uint64,
-	SkipChecks bool,
-) error {
-	validate_request := model.CheckMapfixRequest{
-		MapfixID:   MapfixID,
-		ModelID:    ModelID,
-		SkipChecks: SkipChecks,
-	}
-
-	j, err := json.Marshal(validate_request)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.nats.Publish("maptest.mapfixes.check", []byte(j))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (svc *Service) NatsUploadMapfix(
-	MapfixID      int64,
-	ModelID       uint64,
-	ModelVersion  uint64,
-	TargetAssetID uint64,
-) error {
-	upload_fix_request := model.UploadMapfixRequest{
-		MapfixID:      MapfixID,
-		ModelID:       ModelID,
-		ModelVersion:  ModelVersion,
-		TargetAssetID: TargetAssetID,
-	}
-
-	j, err := json.Marshal(upload_fix_request)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.nats.Publish("maptest.mapfixes.upload", []byte(j))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (svc *Service) NatsValidateMapfix(
-	MapfixID         int64,
-	ModelID          uint64,
-	ModelVersion     uint64,
-	ValidatedAssetID uint64,
-) error {
-	validate_request := model.ValidateMapfixRequest{
-		MapfixID:         MapfixID,
-		ModelID:          ModelID,
-		ModelVersion:     ModelVersion,
-		ValidatedModelID: nil,
-	}
-
-	// sentinel values because we're not using rust
-	if ValidatedAssetID != 0 {
-		validate_request.ValidatedModelID = &ValidatedAssetID
-	}
-
-	j, err := json.Marshal(validate_request)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.nats.Publish("maptest.mapfixes.validate", []byte(j))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

pkg/service/nats_submission.go

@@ -1,120 +0,0 @@
-package service
-
-import (
-	"encoding/json"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-)
-
-func (svc *Service) NatsCreateSubmission(
-	OperationID int32,
-	ModelID     uint64,
-	DisplayName string,
-	Creator     string,
-	GameID      uint32,
-	Status      uint32,
-	Roles       uint32,
-) error {
-	create_request := model.CreateSubmissionRequest{
-		OperationID: OperationID,
-		ModelID:     ModelID,
-		DisplayName: DisplayName,
-		Creator:     Creator,
-		GameID:      GameID,
-		Status:      Status,
-		Roles:       Roles,
-	}
-
-	j, err := json.Marshal(create_request)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.nats.Publish("maptest.submissions.create", []byte(j))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (svc *Service) NatsCheckSubmission(
-	SubmissionID int64,
-	ModelID      uint64,
-	SkipChecks   bool,
-) error {
-	validate_request := model.CheckSubmissionRequest{
-		SubmissionID: SubmissionID,
-		ModelID:      ModelID,
-		SkipChecks:   SkipChecks,
-	}
-
-	j, err := json.Marshal(validate_request)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.nats.Publish("maptest.submissions.check", []byte(j))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (svc *Service) NatsUploadSubmission(
-	SubmissionID int64,
-	ModelID      uint64,
-	ModelVersion uint64,
-	ModelName    string,
-) error {
-	upload_new_request := model.UploadSubmissionRequest{
-		SubmissionID: SubmissionID,
-		ModelID:      ModelID,
-		ModelVersion: ModelVersion,
-		ModelName:    ModelName,
-	}
-
-	j, err := json.Marshal(upload_new_request)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.nats.Publish("maptest.submissions.upload", []byte(j))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (svc *Service) NatsValidateSubmission(
-	SubmissionID     int64,
-	ModelID          uint64,
-	ModelVersion     uint64,
-	ValidatedModelID uint64,
-) error {
-	validate_request := model.ValidateSubmissionRequest{
-		SubmissionID:     SubmissionID,
-		ModelID:          ModelID,
-		ModelVersion:     ModelVersion,
-		ValidatedModelID: nil,
-	}
-
-	// sentinel values because we're not using rust
-	if ValidatedModelID != 0 {
-		validate_request.ValidatedModelID = &ValidatedModelID
-	}
-
-	j, err := json.Marshal(validate_request)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.nats.Publish("maptest.submissions.validate", []byte(j))
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

pkg/service/operations.go

@@ -1,55 +0,0 @@
-package service
-
-import (
-	"context"
-	"time"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-)
-
-type OperationFailParams datastore.OptionalMap
-
-func NewOperationFailParams(
-	status_message string,
-) OperationFailParams {
-	filter := datastore.Optional()
-	filter.Add("status_id", model.OperationStatusFailed)
-	filter.Add("status_message", status_message)
-	return OperationFailParams(filter)
-}
-
-type OperationCompleteParams datastore.OptionalMap
-
-func NewOperationCompleteParams(
-	path string,
-) OperationCompleteParams {
-	filter := datastore.Optional()
-	filter.Add("status_id", model.OperationStatusCompleted)
-	filter.Add("path", path)
-	return OperationCompleteParams(filter)
-}
-
-func (svc *Service) CreateOperation(ctx context.Context, operation model.Operation) (model.Operation, error) {
-	return svc.db.Operations().Create(ctx, operation)
-}
-
-func (svc *Service) CountOperationsSince(ctx context.Context, owner int64, since time.Time) (int64, error) {
-	return svc.db.Operations().CountSince(ctx, owner, since)
-}
-
-func (svc *Service) DeleteOperation(ctx context.Context, id int32) error {
-	return svc.db.Operations().Delete(ctx, id)
-}
-
-func (svc *Service) GetOperation(ctx context.Context, id int32) (model.Operation, error) {
-	return svc.db.Operations().Get(ctx, id)
-}
-
-func (svc *Service) FailOperation(ctx context.Context, id int32, params OperationFailParams) error {
-	return svc.db.Operations().Update(ctx, id, datastore.OptionalMap(params))
-}
-
-func (svc *Service) CompleteOperation(ctx context.Context, id int32, params OperationCompleteParams) error {
-	return svc.db.Operations().Update(ctx, id, datastore.OptionalMap(params))
-}

pkg/service/script_policy.go

@@ -2,44 +2,155 @@ package service
 
 import (
 	"context"
+	"fmt"
+	"strconv"
 
+	"git.itzana.me/strafesnet/maps-service/pkg/api"
 	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
 	"git.itzana.me/strafesnet/maps-service/pkg/model"
 )
 
-type ScriptPolicyFilter datastore.OptionalMap
+// CreateScriptPolicy implements createScriptPolicy operation.
+//
+// Create a new script policy.
+//
+// POST /script-policy
+func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolicyCreate) (*api.ID, error) {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return nil, ErrUserInfo
+	}
 
-func NewScriptPolicyFilter() ScriptPolicyFilter {
+	if !userInfo.Roles.ScriptWrite {
-	filter := datastore.Optional()
+		return nil, ErrPermissionDenied
-	return ScriptPolicyFilter(filter)
+	}
-}
+
-func (filter ScriptPolicyFilter) SetFromScriptHash(from_script_hash int64) {
+	from_script, err := svc.DB.Scripts().Get(ctx, req.FromScriptID)
-	// Finally, type safety!
+	if err != nil {
-	datastore.OptionalMap(filter).Add("from_script_hash", from_script_hash)
+		return nil, err
-}
+	}
-func (filter ScriptPolicyFilter) SetToScriptID(to_script_id int64) {
+
-	datastore.OptionalMap(filter).Add("to_script_id", to_script_id)
+	// the existence of ToScriptID does not need to be validated because it's checked by a foreign key constraint.
-}
+
-func (filter ScriptPolicyFilter) SetPolicy(policy int32) {
+	script, err := svc.DB.ScriptPolicy().Create(ctx, model.ScriptPolicy{
-	datastore.OptionalMap(filter).Add("policy", policy)
+		ID:             0,
+		FromScriptHash: from_script.Hash,
+		ToScriptID:     req.ToScriptID,
+		Policy:         model.Policy(req.Policy),
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return &api.ID{
+		ID: script.ID,
+	}, nil
 }
 
-func (svc *Service) CreateScriptPolicy(ctx context.Context, script model.ScriptPolicy) (model.ScriptPolicy, error) {
+// DeleteScriptPolicy implements deleteScriptPolicy operation.
-	return svc.db.ScriptPolicy().Create(ctx, script)
+//
+// Delete the specified script policy by ID.
+//
+// DELETE /script-policy/id/{ScriptPolicyID}
+func (svc *Service) DeleteScriptPolicy(ctx context.Context, params api.DeleteScriptPolicyParams) error {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return ErrUserInfo
+	}
+
+	if !userInfo.Roles.ScriptWrite {
+		return ErrPermissionDenied
+	}
+
+	return svc.DB.ScriptPolicy().Delete(ctx, params.ScriptPolicyID)
 }
 
-func (svc *Service) ListScriptPolicies(ctx context.Context, filter ScriptPolicyFilter, page model.Page) ([]model.ScriptPolicy, error) {
+// GetScriptPolicy implements getScriptPolicy operation.
-	return svc.db.ScriptPolicy().List(ctx, datastore.OptionalMap(filter), page)
+//
+// Get the specified script policy by ID.
+//
+// GET /script-policy/id/{ScriptPolicyID}
+func (svc *Service) GetScriptPolicy(ctx context.Context, params api.GetScriptPolicyParams) (*api.ScriptPolicy, error) {
+	_, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return nil, ErrUserInfo
+	}
+
+	// Read permission for script policy only requires you to be logged in
+
+	policy, err := svc.DB.ScriptPolicy().Get(ctx, params.ScriptPolicyID)
+	if err != nil {
+		return nil, err
+	}
+
+	return &api.ScriptPolicy{
+		ID:             policy.ID,
+		FromScriptHash: fmt.Sprintf("%x", policy.FromScriptHash),
+		ToScriptID:     policy.ToScriptID,
+		Policy:         int32(policy.Policy),
+	}, nil
 }
 
-func (svc *Service) DeleteScriptPolicy(ctx context.Context, id int64) error {
+// GetScriptPolicyFromHash implements getScriptPolicyFromHash operation.
-	return svc.db.ScriptPolicy().Delete(ctx, id)
+//
+// Get the policy for the given hash of script source code.
+//
+// GET /script-policy/hash/{FromScriptHash}
+func (svc *Service) GetScriptPolicyFromHash(ctx context.Context, params api.GetScriptPolicyFromHashParams) (*api.ScriptPolicy, error) {
+	_, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return nil, ErrUserInfo
+	}
+
+	// Read permission for script policy only requires you to be logged in
+
+	// parse hash from hex
+	hash, err := strconv.ParseUint(params.FromScriptHash, 16, 64)
+	if err != nil {
+		return nil, err
+	}
+
+	policy, err := svc.DB.ScriptPolicy().GetFromHash(ctx, hash)
+	if err != nil {
+		return nil, err
+	}
+
+	return &api.ScriptPolicy{
+		ID:             policy.ID,
+		FromScriptHash: fmt.Sprintf("%x", policy.FromScriptHash),
+		ToScriptID:     policy.ToScriptID,
+		Policy:         int32(policy.Policy),
+	}, nil
 }
 
-func (svc *Service) GetScriptPolicy(ctx context.Context, id int64) (model.ScriptPolicy, error) {
+// UpdateScriptPolicy implements updateScriptPolicy operation.
-	return svc.db.ScriptPolicy().Get(ctx, id)
+//
-}
+// Update the specified script policy by ID.
+//
+// PATCH /script-policy/id/{ScriptPolicyID}
+func (svc *Service) UpdateScriptPolicy(ctx context.Context, req *api.ScriptPolicyUpdate, params api.UpdateScriptPolicyParams) error {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return ErrUserInfo
+	}
 
-func (svc *Service) UpdateScriptPolicy(ctx context.Context, id int64, pmap ScriptPolicyFilter) error {
+	if !userInfo.Roles.ScriptWrite {
-	return svc.db.ScriptPolicy().Update(ctx, id, datastore.OptionalMap(pmap))
+		return ErrPermissionDenied
+	}
+
+	pmap := datastore.Optional()
+	if from_script_id, ok := req.FromScriptID.Get(); ok {
+		from_script, err := svc.DB.Scripts().Get(ctx, from_script_id)
+		if err != nil {
+			return err
+		}
+		pmap.Add("from_script_hash", from_script.Hash)
+	}
+	if to_script_id, ok := req.ToScriptID.Get(); ok {
+		pmap.Add("to_script_id", to_script_id)
+	}
+	if policy, ok := req.Policy.Get(); ok {
+		pmap.Add("policy", policy)
+	}
+	return svc.DB.ScriptPolicy().Update(ctx, req.ID, pmap)
 }

pkg/service/scripts.go

@@ -2,49 +2,110 @@ package service
 
 import (
 	"context"
+	"fmt"
 
+	"git.itzana.me/strafesnet/maps-service/pkg/api"
 	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
 	"git.itzana.me/strafesnet/maps-service/pkg/model"
+	"github.com/dchest/siphash"
 )
 
-type ScriptFilter datastore.OptionalMap
+// CreateScript implements createScript operation.
+//
+// Create a new script.
+//
+// POST /scripts
+func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*api.ID, error) {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return nil, ErrUserInfo
+	}
 
-func NewScriptFilter() ScriptFilter {
+	if !userInfo.Roles.ScriptWrite {
-	filter := datastore.Optional()
+		return nil, ErrPermissionDenied
-	return ScriptFilter(filter)
+	}
-}
+
-func (filter ScriptFilter) SetName(name string) {
+	script, err := svc.DB.Scripts().Create(ctx, model.Script{
-	datastore.OptionalMap(filter).Add("name", name)
+		ID:           0,
-}
+		Hash:         siphash.Hash(0, 0, []byte(req.Source)),
-func (filter ScriptFilter) SetSource(source string) {
+		Source:       req.Source,
-	datastore.OptionalMap(filter).Add("source", source)
+		SubmissionID: req.SubmissionID.Or(0),
-}
+	})
-func (filter ScriptFilter) SetHash(hash int64) {
+	if err != nil {
-	datastore.OptionalMap(filter).Add("hash", hash)
+		return nil, err
-}
+	}
-func (filter ScriptFilter) SetResourceType(resource_type int32) {
+
-	datastore.OptionalMap(filter).Add("resource_type", resource_type)
+	return &api.ID{
-}
+		ID: script.ID,
-func (filter ScriptFilter) SetResourceID(resource_id int64) {
+	}, nil
-	datastore.OptionalMap(filter).Add("resource_id", resource_id)
 }
 
-func (svc *Service) CreateScript(ctx context.Context, script model.Script) (model.Script, error) {
+// DeleteScript implements deleteScript operation.
-	return svc.db.Scripts().Create(ctx, script)
+//
+// Delete the specified script by ID.
+//
+// DELETE /scripts/{ScriptID}
+func (svc *Service) DeleteScript(ctx context.Context, params api.DeleteScriptParams) error {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return ErrUserInfo
+	}
+
+	if !userInfo.Roles.ScriptWrite {
+		return ErrPermissionDenied
+	}
+
+	return svc.DB.Scripts().Delete(ctx, params.ScriptID)
 }
 
-func (svc *Service) ListScripts(ctx context.Context, filter ScriptFilter, page model.Page) ([]model.Script, error) {
+// GetScript implements getScript operation.
-	return svc.db.Scripts().List(ctx, datastore.OptionalMap(filter), page)
+//
+// Get the specified script by ID.
+//
+// GET /scripts/{ScriptID}
+func (svc *Service) GetScript(ctx context.Context, params api.GetScriptParams) (*api.Script, error) {
+	_, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return nil, ErrUserInfo
+	}
+
+	// Read permission for scripts only requires you to be logged in
+
+	script, err := svc.DB.Scripts().Get(ctx, params.ScriptID)
+	if err != nil {
+		return nil, err
+	}
+
+	return &api.Script{
+		ID:           script.ID,
+		Hash:         fmt.Sprintf("%x", script.Hash),
+		Source:       script.Source,
+		SubmissionID: script.SubmissionID,
+	}, nil
 }
 
-func (svc *Service) DeleteScript(ctx context.Context, id int64) error {
+// UpdateScript implements updateScript operation.
-	return svc.db.Scripts().Delete(ctx, id)
+//
-}
+// Update the specified script by ID.
+//
+// PATCH /scripts/{ScriptID}
+func (svc *Service) UpdateScript(ctx context.Context, req *api.ScriptUpdate, params api.UpdateScriptParams) error {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return ErrUserInfo
+	}
 
-func (svc *Service) GetScript(ctx context.Context, id int64) (model.Script, error) {
+	if !userInfo.Roles.ScriptWrite {
-	return svc.db.Scripts().Get(ctx, id)
+		return ErrPermissionDenied
-}
+	}
 
-func (svc *Service) UpdateScript(ctx context.Context, id int64, pmap ScriptFilter) error {
+	pmap := datastore.Optional()
-	return svc.db.Scripts().Update(ctx, id, datastore.OptionalMap(pmap))
+	if source, ok := req.Source.Get(); ok {
+		pmap.Add("source", source)
+		pmap.Add("hash", siphash.Hash(0, 0, []byte(source)))
+	}
+	if SubmissionID, ok := req.SubmissionID.Get(); ok {
+		pmap.Add("submission_id", SubmissionID)
+	}
+	return svc.DB.Scripts().Update(ctx, req.ID, pmap)
 }

pkg/service/security.go

@@ -0,0 +1,95 @@
+package service
+
+import (
+	"context"
+	"errors"
+	"git.itzana.me/strafesnet/go-grpc/auth"
+	"git.itzana.me/strafesnet/maps-service/pkg/api"
+)
+
+var (
+	// ErrMissingSessionID there is no session id
+	ErrMissingSessionID = errors.New("SessionID missing")
+	// ErrInvalidSession caller does not have a valid session
+	ErrInvalidSession = errors.New("Session invalid")
+)
+
+var (
+	// has SubmissionPublish
+	RoleMapAdmin int32 = 128
+	// has SubmissionReview
+	RoleMapCouncil int32 = 64
+)
+
+type Roles struct {
+	// human roles
+	SubmissionPublish bool
+	SubmissionReview  bool
+	ScriptWrite       bool
+	// automated roles
+	Maptest   bool
+	Validator bool
+}
+
+type UserInfo struct {
+	Roles  Roles
+	UserID uint64
+}
+
+func (usr UserInfo) IsSubmitter(submitter uint64) bool {
+	return usr.UserID == submitter
+}
+
+type SecurityHandler struct {
+	Client auth.AuthServiceClient
+}
+
+func (svc SecurityHandler) HandleCookieAuth(ctx context.Context, operationName api.OperationName, t api.CookieAuth) (context.Context, error) {
+	sessionId := t.GetAPIKey()
+	if sessionId == "" {
+		return nil, ErrMissingSessionID
+	}
+
+	session, err := svc.Client.GetSessionUser(ctx, &auth.IdMessage{
+		SessionID: sessionId,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	role, err := svc.Client.GetGroupRole(ctx, &auth.IdMessage{
+		SessionID: sessionId,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	validate, err := svc.Client.ValidateSession(ctx, &auth.IdMessage{
+		SessionID: sessionId,
+	})
+	if err != nil {
+		return nil, err
+	}
+	if !validate.Valid {
+		return nil, ErrInvalidSession
+	}
+
+	roles := Roles{}
+
+	// fix this when roblox udpates group roles
+	for _, r := range role.Roles {
+		if RoleMapAdmin <= r.Rank {
+			roles.SubmissionPublish = true
+		}
+		if RoleMapCouncil <= r.Rank {
+			roles.SubmissionReview = true
+		}
+	}
+
+	newCtx := context.WithValue(ctx, "UserInfo", UserInfo{
+		Roles:  roles,
+		UserID: session.UserID,
+	})
+
+	return newCtx, nil
+}

pkg/service/service.go

@@ -1,29 +1,41 @@
 package service
 
 import (
-	"git.itzana.me/strafesnet/go-grpc/maps"
+	"context"
-	"git.itzana.me/strafesnet/go-grpc/users"
+	"errors"
+	"git.itzana.me/strafesnet/maps-service/pkg/api"
 	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
 	"github.com/nats-io/nats.go"
 )
 
+var (
+	// ErrPermissionDenied caller does not have the required role
+	ErrPermissionDenied = errors.New("Permission denied")
+	// ErrUserInfo user info is missing for some reason
+	ErrUserInfo = errors.New("Missing user info")
+)
+
 type Service struct {
-	db     datastore.Datastore
+	DB   datastore.Datastore
-	nats   nats.JetStreamContext
+	Nats nats.JetStreamContext
-	maps   maps.MapsServiceClient
-	users  users.UsersServiceClient
 }
 
-func NewService(
+// NewError creates *ErrorStatusCode from error returned by handler.
-	db datastore.Datastore,
+//
-	nats nats.JetStreamContext,
+// Used for common default response.
-	maps maps.MapsServiceClient,
+func (svc *Service) NewError(ctx context.Context, err error) *api.ErrorStatusCode {
-	users users.UsersServiceClient,
+	status := 500
-) Service {
+	if errors.Is(err, ErrPermissionDenied) {
-	return Service{
+		status = 403
-		db:     db,
+	}
-		nats:   nats,
+	if errors.Is(err, ErrUserInfo) {
-		maps:   maps,
+		status = 401
-		users:  users,
+	}
+	return &api.ErrorStatusCode{
+		StatusCode: status,
+		Response: api.Error{
+			Code:    int64(status),
+			Message: err.Error(),
+		},
 	}
 }

pkg/service/submissions.go

@@ -2,119 +2,389 @@ package service
 
 import (
 	"context"
+	"encoding/json"
 
+	"git.itzana.me/strafesnet/maps-service/pkg/api"
 	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
 	"git.itzana.me/strafesnet/maps-service/pkg/model"
 )
 
-type SubmissionUpdate datastore.OptionalMap
+// POST /submissions
+func (svc *Service) CreateSubmission(ctx context.Context, request *api.SubmissionCreate) (*api.ID, error) {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return nil, ErrUserInfo
+	}
 
-func NewSubmissionUpdate() SubmissionUpdate {
+	submission, err := svc.DB.Submissions().Create(ctx, model.Submission{
-	update := datastore.Optional()
+		ID:            0,
-	return SubmissionUpdate(update)
+		DisplayName:   request.DisplayName,
+		Creator:       request.Creator,
+		GameID:        request.GameID,
+		Submitter:     userInfo.UserID,
+		AssetID:       uint64(request.AssetID),
+		AssetVersion:  uint64(request.AssetVersion),
+		Completed:     false,
+		TargetAssetID: uint64(request.TargetAssetID.Value),
+		StatusID:      model.StatusUnderConstruction,
+	})
+	if err != nil {
+		return nil, err
+	}
+	return &api.ID{
+		ID: submission.ID,
+	}, nil
 }
 
-func (update SubmissionUpdate) SetDisplayName(display_name string) {
+// GetSubmission implements getSubmission operation.
-	datastore.OptionalMap(update).Add("display_name", display_name)
+//
-}
+// Retrieve map with ID.
-func (update SubmissionUpdate) SetCreator(creator string) {
+//
-	datastore.OptionalMap(update).Add("creator", creator)
+// GET /submissions/{SubmissionID}
-}
+func (svc *Service) GetSubmission(ctx context.Context, params api.GetSubmissionParams) (*api.Submission, error) {
-func (update SubmissionUpdate) SetGameID(game_id uint32) {
+	submission, err := svc.DB.Submissions().Get(ctx, params.SubmissionID)
-	datastore.OptionalMap(update).Add("game_id", game_id)
+	if err != nil {
-}
+		return nil, err
-func (update SubmissionUpdate) SetSubmitter(submitter uint64) {
+	}
-	datastore.OptionalMap(update).Add("submitter", submitter)
+	return &api.Submission{
-}
+		ID:            submission.ID,
-func (update SubmissionUpdate) SetAssetID(asset_id uint64) {
+		DisplayName:   submission.DisplayName,
-	datastore.OptionalMap(update).Add("asset_id", asset_id)
+		Creator:       submission.Creator,
-}
+		GameID:        submission.GameID,
-func (update SubmissionUpdate) SetAssetVersion(asset_version uint64) {
+		CreatedAt:     submission.CreatedAt.Unix(),
-	datastore.OptionalMap(update).Add("asset_version", asset_version)
+		UpdatedAt:     submission.UpdatedAt.Unix(),
-}
+		Submitter:     int64(submission.Submitter),
-func (update SubmissionUpdate) SetValidatedAssetID(validated_asset_id uint64) {
+		AssetID:       int64(submission.AssetID),
-	datastore.OptionalMap(update).Add("validated_asset_id", validated_asset_id)
+		AssetVersion:  int64(submission.AssetVersion),
-}
+		Completed:     submission.Completed,
-func (update SubmissionUpdate) SetValidatedAssetVersion(validated_asset_version uint64) {
+		TargetAssetID: api.NewOptInt64(int64(submission.TargetAssetID)),
-	datastore.OptionalMap(update).Add("validated_asset_version", validated_asset_version)
+		StatusID:      int32(submission.StatusID),
-}
+	}, nil
-func (update SubmissionUpdate) SetCompleted(completed bool) {
-	datastore.OptionalMap(update).Add("completed", completed)
-}
-func (update SubmissionUpdate) SetUploadedAssetID(uploaded_asset_id uint64) {
-	datastore.OptionalMap(update).Add("uploaded_asset_id", uploaded_asset_id)
-}
-func (update SubmissionUpdate) SetStatusID(status_id model.SubmissionStatus) {
-	datastore.OptionalMap(update).Add("status_id", status_id)
-}
-func (update SubmissionUpdate) SetDescription(description string) {
-	datastore.OptionalMap(update).Add("description", description)
 }
 
-type SubmissionFilter datastore.OptionalMap
+// ListSubmissions implements listSubmissions operation.
-
+//
-func NewSubmissionFilter(
+// Get list of submissions.
-) SubmissionFilter {
+//
+// GET /submissions
+func (svc *Service) ListSubmissions(ctx context.Context, request api.ListSubmissionsParams) ([]api.Submission, error) {
 	filter := datastore.Optional()
-	return SubmissionFilter(filter)
+	//fmt.Println(request)
-}
+	if request.Filter.IsSet() {
-func (update SubmissionFilter) SetDisplayName(display_name string) {
+		filter.AddNotNil("display_name", request.Filter.Value.DisplayName)
-	datastore.OptionalMap(update).Add("display_name", display_name)
+		filter.AddNotNil("creator", request.Filter.Value.Creator)
-}
+		filter.AddNotNil("game_id", request.Filter.Value.GameID)
-func (update SubmissionFilter) SetCreator(creator string) {
+	}
-	datastore.OptionalMap(update).Add("creator", creator)
+
-}
+	items, err := svc.DB.Submissions().List(ctx, filter, model.Page{
-func (update SubmissionFilter) SetGameID(game_id uint32) {
+		Number: request.Page.GetPage(),
-	datastore.OptionalMap(update).Add("game_id", game_id)
+		Size:   request.Page.GetLimit(),
-}
+	})
-func (update SubmissionFilter) SetSubmitter(submitter uint64) {
+	if err != nil {
-	datastore.OptionalMap(update).Add("submitter", submitter)
+		return nil, err
-}
+	}
-func (update SubmissionFilter) SetAssetID(asset_id uint64) {
+
-	datastore.OptionalMap(update).Add("asset_id", asset_id)
+	var resp []api.Submission
-}
+	for i := 0; i < len(items); i++ {
-func (update SubmissionFilter) SetAssetVersion(asset_version uint64) {
+		resp = append(resp, api.Submission{
-	datastore.OptionalMap(update).Add("asset_version", asset_version)
+			ID:            items[i].ID,
-}
+			DisplayName:   items[i].DisplayName,
-func (update SubmissionFilter) SetUploadedAssetID(uploaded_asset_id uint64) {
+			Creator:       items[i].Creator,
-	datastore.OptionalMap(update).Add("uploaded_asset_id", uploaded_asset_id)
+			GameID:        items[i].GameID,
-}
+			CreatedAt:     items[i].CreatedAt.Unix(),
-func (update SubmissionFilter) SetStatuses(statuses []model.SubmissionStatus) {
+			UpdatedAt:     items[i].UpdatedAt.Unix(),
-	datastore.OptionalMap(update).Add("status_id", statuses)
+			Submitter:     int64(items[i].Submitter),
+			AssetID:       int64(items[i].AssetID),
+			AssetVersion:  int64(items[i].AssetVersion),
+			Completed:     items[i].Completed,
+			TargetAssetID: api.NewOptInt64(int64(items[i].TargetAssetID)),
+			StatusID:      int32(items[i].StatusID),
+		})
+	}
+
+	return resp, nil
 }
 
-func (svc *Service) CreateSubmission(ctx context.Context, script model.Submission) (model.Submission, error) {
+// PatchSubmissionCompleted implements patchSubmissionCompleted operation.
-	return svc.db.Submissions().Create(ctx, script)
+//
+// Retrieve map with ID.
+//
+// POST /submissions/{SubmissionID}/completed
+func (svc *Service) SetSubmissionCompleted(ctx context.Context, params api.SetSubmissionCompletedParams) error {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return ErrUserInfo
+	}
+
+	// check if caller has MaptestGame role (request must originate from a maptest roblox game)
+	if !userInfo.Roles.Maptest {
+		return ErrPermissionDenied
+	}
+
+	pmap := datastore.Optional()
+	pmap.Add("completed", true)
+	err := svc.DB.Submissions().Update(ctx, params.SubmissionID, pmap)
+	return err
 }
 
-func (svc *Service) ListSubmissions(ctx context.Context, filter SubmissionFilter, page model.Page, sort datastore.ListSort) ([]model.Submission, error) {
+// PatchSubmissionModel implements patchSubmissionModel operation.
-	return svc.db.Submissions().List(ctx, datastore.OptionalMap(filter), page, sort)
+//
+// Update model following role restrictions.
+//
+// POST /submissions/{SubmissionID}/model
+func (svc *Service) UpdateSubmissionModel(ctx context.Context, params api.UpdateSubmissionModelParams) error {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return ErrUserInfo
+	}
+
+	// read submission (this could be done with a transaction WHERE clause)
+	submission, err := svc.DB.Submissions().Get(ctx, params.SubmissionID)
+	if err != nil {
+		return err
+	}
+
+	// check if caller is the submitter
+	if !userInfo.IsSubmitter(submission.Submitter) {
+		return ErrPermissionDenied
+	}
+
+	// check if Status is ChangesRequested|Submitted|UnderConstruction
+	pmap := datastore.Optional()
+	pmap.AddNotNil("asset_id", params.ModelID)
+	pmap.AddNotNil("asset_version", params.VersionID)
+	//always reset completed when model changes
+	pmap.Add("completed", false)
+	return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.Status{model.StatusChangesRequested, model.StatusSubmitted, model.StatusUnderConstruction}, pmap)
 }
 
-func (svc *Service) ListSubmissionsWithTotal(ctx context.Context, filter SubmissionFilter, page model.Page, sort datastore.ListSort) (int64, []model.Submission, error) {
+// ActionSubmissionPublish invokes actionSubmissionPublish operation.
-	return svc.db.Submissions().ListWithTotal(ctx, datastore.OptionalMap(filter), page, sort)
+//
+// Role Validator changes status from Publishing -> Published.
+//
+// POST /submissions/{SubmissionID}/status/publish
+func (svc *Service) ActionSubmissionPublish(ctx context.Context, params api.ActionSubmissionPublishParams) error {
+	println("[ActionSubmissionPublish] Implicit Validator permission granted!")
+
+	// transaction
+	smap := datastore.Optional()
+	smap.Add("status_id", model.StatusPublished)
+	return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.Status{model.StatusPublishing}, smap)
 }
 
-func (svc *Service) DeleteSubmission(ctx context.Context, id int64) error {
+// ActionSubmissionReject invokes actionSubmissionReject operation.
-	return svc.db.Submissions().Delete(ctx, id)
+//
+// Role Reviewer changes status from Submitted -> Rejected.
+//
+// POST /submissions/{SubmissionID}/status/reject
+func (svc *Service) ActionSubmissionReject(ctx context.Context, params api.ActionSubmissionRejectParams) error {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return ErrUserInfo
+	}
+
+	// check if caller has required role
+	if !userInfo.Roles.SubmissionReview {
+		return ErrPermissionDenied
+	}
+
+	// transaction
+	smap := datastore.Optional()
+	smap.Add("status_id", model.StatusRejected)
+	return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.Status{model.StatusSubmitted}, smap)
 }
 
-func (svc *Service) GetSubmission(ctx context.Context, id int64) (model.Submission, error) {
+// ActionSubmissionRequestChanges invokes actionSubmissionRequestChanges operation.
-	return svc.db.Submissions().Get(ctx, id)
+//
+// Role Reviewer changes status from Validated|Accepted|Submitted -> ChangesRequested.
+//
+// POST /submissions/{SubmissionID}/status/request-changes
+func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params api.ActionSubmissionRequestChangesParams) error {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return ErrUserInfo
+	}
+
+	// check if caller has required role
+	if !userInfo.Roles.SubmissionReview {
+		return ErrPermissionDenied
+	}
+
+	// transaction
+	smap := datastore.Optional()
+	smap.Add("status_id", model.StatusChangesRequested)
+	return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.Status{model.StatusValidated, model.StatusAccepted, model.StatusSubmitted}, smap)
 }
 
-func (svc *Service) GetSubmissionList(ctx context.Context, ids []int64) ([]model.Submission, error) {
+// ActionSubmissionRevoke invokes actionSubmissionRevoke operation.
-	return svc.db.Submissions().GetList(ctx, ids)
+//
+// Role Submitter changes status from Submitted|ChangesRequested -> UnderConstruction.
+//
+// POST /submissions/{SubmissionID}/status/revoke
+func (svc *Service) ActionSubmissionRevoke(ctx context.Context, params api.ActionSubmissionRevokeParams) error {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return ErrUserInfo
+	}
+
+	// read submission (this could be done with a transaction WHERE clause)
+	submission, err := svc.DB.Submissions().Get(ctx, params.SubmissionID)
+	if err != nil {
+		return err
+	}
+
+	// check if caller is the submitter
+	if !userInfo.IsSubmitter(submission.Submitter) {
+		return ErrPermissionDenied
+	}
+
+	// transaction
+	smap := datastore.Optional()
+	smap.Add("status_id", model.StatusUnderConstruction)
+	return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.Status{model.StatusSubmitted, model.StatusChangesRequested}, smap)
 }
 
-func (svc *Service) UpdateSubmission(ctx context.Context, id int64, pmap SubmissionUpdate) error {
+// ActionSubmissionSubmit invokes actionSubmissionSubmit operation.
-	return svc.db.Submissions().Update(ctx, id, datastore.OptionalMap(pmap))
+//
+// Role Submitter changes status from UnderConstruction|ChangesRequested -> Submitted.
+//
+// POST /submissions/{SubmissionID}/status/submit
+func (svc *Service) ActionSubmissionSubmit(ctx context.Context, params api.ActionSubmissionSubmitParams) error {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return ErrUserInfo
+	}
+
+	// read submission (this could be done with a transaction WHERE clause)
+	submission, err := svc.DB.Submissions().Get(ctx, params.SubmissionID)
+	if err != nil {
+		return err
+	}
+
+	// check if caller is the submitter
+	if !userInfo.IsSubmitter(submission.Submitter) {
+		return ErrPermissionDenied
+	}
+
+	// transaction
+	smap := datastore.Optional()
+	smap.Add("status_id", model.StatusSubmitted)
+	return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.Status{model.StatusUnderConstruction, model.StatusChangesRequested}, smap)
 }
 
-func (svc *Service) UpdateSubmissionIfStatus(ctx context.Context, id int64, statuses []model.SubmissionStatus, pmap SubmissionUpdate) error {
+// ActionSubmissionTriggerPublish invokes actionSubmissionTriggerPublish operation.
-	return svc.db.Submissions().IfStatusThenUpdate(ctx, id, statuses, datastore.OptionalMap(pmap))
+//
+// Role Admin changes status from Validated -> Publishing.
+//
+// POST /submissions/{SubmissionID}/status/trigger-publish
+func (svc *Service) ActionSubmissionTriggerPublish(ctx context.Context, params api.ActionSubmissionTriggerPublishParams) error {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return ErrUserInfo
+	}
+
+	// check if caller has required role
+	if !userInfo.Roles.SubmissionPublish {
+		return ErrPermissionDenied
+	}
+
+	// transaction
+	smap := datastore.Optional()
+	smap.Add("status_id", model.StatusPublishing)
+	submission, err := svc.DB.Submissions().IfStatusThenUpdateAndGet(ctx, params.SubmissionID, []model.Status{model.StatusValidated}, smap)
+	if err != nil {
+		return err
+	}
+
+	// sentinel value because we are not using rust
+	if submission.TargetAssetID == 0 {
+		// this is a new map
+		publish_new_request := model.PublishNewRequest{
+			SubmissionID: submission.ID,
+			ModelID:      submission.AssetID,
+			ModelVersion: submission.AssetVersion,
+			Creator:      submission.Creator,
+			DisplayName:  submission.DisplayName,
+			GameID:       uint32(submission.GameID),
+		}
+
+		j, err := json.Marshal(publish_new_request)
+		if err != nil {
+			return err
+		}
+
+		svc.Nats.Publish("maptest.submissions.publish.new", []byte(j))
+	} else {
+		// this is a map fix
+		publish_fix_request := model.PublishFixRequest{
+			SubmissionID:  submission.ID,
+			ModelID:       submission.AssetID,
+			ModelVersion:  submission.AssetVersion,
+			TargetAssetID: submission.TargetAssetID,
+		}
+
+		j, err := json.Marshal(publish_fix_request)
+		if err != nil {
+			return err
+		}
+
+		svc.Nats.Publish("maptest.submissions.publish.fix", []byte(j))
+	}
+
+	return nil
 }
 
-func (svc *Service) UpdateAndGetSubmissionIfStatus(ctx context.Context, id int64, statuses []model.SubmissionStatus, pmap SubmissionUpdate) (model.Submission, error) {
+// ActionSubmissionTriggerValidate invokes actionSubmissionTriggerValidate operation.
-	return svc.db.Submissions().IfStatusThenUpdateAndGet(ctx, id, statuses, datastore.OptionalMap(pmap))
+//
+// Role Reviewer triggers validation and changes status from Submitted|Accepted -> Validating.
+//
+// POST /submissions/{SubmissionID}/status/trigger-validate
+func (svc *Service) ActionSubmissionTriggerValidate(ctx context.Context, params api.ActionSubmissionTriggerValidateParams) error {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return ErrUserInfo
+	}
+
+	// check if caller has required role
+	if !userInfo.Roles.SubmissionReview {
+		return ErrPermissionDenied
+	}
+
+	// transaction
+	smap := datastore.Optional()
+	smap.Add("status_id", model.StatusValidating)
+	submission, err := svc.DB.Submissions().IfStatusThenUpdateAndGet(ctx, params.SubmissionID, []model.Status{model.StatusSubmitted, model.StatusAccepted}, smap)
+	if err != nil {
+		return err
+	}
+
+	validate_request := model.ValidateRequest{
+		SubmissionID:     submission.ID,
+		ModelID:          submission.AssetID,
+		ModelVersion:     submission.AssetVersion,
+		ValidatedModelID: 0, //TODO: reuse velidation models
+	}
+
+	j, err := json.Marshal(validate_request)
+	if err != nil {
+		return err
+	}
+
+	svc.Nats.Publish("maptest.submissions.validate", []byte(j))
+
+	return nil
+}
+
+// ActionSubmissionValidate invokes actionSubmissionValidate operation.
+//
+// Role Validator changes status from Validating -> Validated.
+//
+// POST /submissions/{SubmissionID}/status/validate
+func (svc *Service) ActionSubmissionValidate(ctx context.Context, params api.ActionSubmissionValidateParams) error {
+	println("[ActionSubmissionValidate] Implicit Validator permission granted!")
+
+	// transaction
+	smap := datastore.Optional()
+	smap.Add("status_id", model.StatusValidated)
+	return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.Status{model.StatusValidating}, smap)
 }

pkg/validator_controller/mapfixes.go

@@ -1,380 +0,0 @@
-package validator_controller
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"git.itzana.me/strafesnet/go-grpc/validator"
-	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service"
-)
-
-type Mapfixes struct {
-	*validator.UnimplementedValidatorMapfixServiceServer
-	inner *service.Service
-}
-func NewMapfixesController(
-	inner *service.Service,
-) Mapfixes {
-	return Mapfixes{
-		inner: inner,
-	}
-}
-
-var(
-	// prevent two mapfixes with same asset id
-	ActiveMapfixStatuses = []model.MapfixStatus{
-		model.MapfixStatusUploading,
-		model.MapfixStatusValidated,
-		model.MapfixStatusValidating,
-		model.MapfixStatusAcceptedUnvalidated,
-		model.MapfixStatusChangesRequested,
-		model.MapfixStatusSubmitted,
-		model.MapfixStatusUnderConstruction,
-	}
-)
-
-var(
-	ErrActiveMapfixSameAssetID = errors.New("There is an active mapfix with the same AssetID")
-	ErrNotAssetOwner = errors.New("You can only submit an asset you own")
-)
-
-// UpdateMapfixValidatedModel implements patchMapfixModel operation.
-//
-// Update model following role restrictions.
-//
-// POST /mapfixes/{MapfixID}/validated-model
-func (svc *Mapfixes) SetValidatedModel(ctx context.Context, params *validator.ValidatedModelRequest) (*validator.NullResponse, error) {
-	MapfixID := int64(params.ID)
-
-	// check if Status is ChangesRequested|Submitted|UnderConstruction
-	update := service.NewMapfixUpdate()
-	update.SetValidatedAssetID(params.ValidatedModelID)
-	update.SetValidatedAssetVersion(params.ValidatedModelVersion)
-	// DO NOT reset completed when validated model is updated
-	// update.Add("completed", false)
-	allow_statuses := []model.MapfixStatus{model.MapfixStatusValidating}
-	err := svc.inner.UpdateMapfixIfStatus(ctx, MapfixID, allow_statuses, update)
-	if err != nil {
-		return nil, err
-	}
-
-	event_data := model.AuditEventDataChangeValidatedModel{
-		ValidatedModelID: params.ValidatedModelID,
-		ValidatedModelVersion: params.ValidatedModelVersion,
-	}
-
-	err = svc.inner.CreateAuditEventChangeValidatedModel(
-		ctx,
-		model.ValidatorUserID,
-		model.Resource{
-			ID: MapfixID,
-			Type: model.ResourceMapfix,
-		},
-		event_data,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// ActionMapfixSubmitted invokes actionMapfixSubmitted operation.
-//
-// Role Validator changes status from Submitting -> Submitted.
-//
-// POST /mapfixes/{MapfixID}/status/validator-submitted
-func (svc *Mapfixes) SetStatusSubmitted(ctx context.Context, params *validator.SubmittedRequest) (*validator.NullResponse, error) {
-	MapfixID := int64(params.ID)
-	// transaction
-	target_status := model.MapfixStatusSubmitted
-	update := service.NewMapfixUpdate()
-	update.SetStatusID(target_status)
-	update.SetAssetVersion(uint64(params.ModelVersion))
-	update.SetDisplayName(params.DisplayName)
-	update.SetCreator(params.Creator)
-	update.SetGameID(uint32(params.GameID))
-	allow_statuses := []model.MapfixStatus{model.MapfixStatusSubmitting}
-	err := svc.inner.UpdateMapfixIfStatus(ctx, MapfixID, allow_statuses, update)
-	if err != nil {
-		return nil, err
-	}
-
-	event_data := model.AuditEventDataAction{
-		TargetStatus: uint32(target_status),
-	}
-
-	err = svc.inner.CreateAuditEventAction(
-		ctx,
-		model.ValidatorUserID,
-		model.Resource{
-			ID: MapfixID,
-			Type: model.ResourceMapfix,
-		},
-		event_data,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// ActionMapfixRequestChanges implements actionMapfixRequestChanges operation.
-//
-// (Internal endpoint) Role Validator changes status from Submitting -> RequestChanges.
-//
-// POST /mapfixes/{MapfixID}/status/validator-request-changes
-func (svc *Mapfixes) SetStatusRequestChanges(ctx context.Context, params *validator.MapfixID) (*validator.NullResponse, error) {
-	MapfixID := int64(params.ID)
-	// transaction
-	target_status := model.MapfixStatusChangesRequested
-	update := service.NewMapfixUpdate()
-	update.SetStatusID(target_status)
-	allow_statuses := []model.MapfixStatus{model.MapfixStatusSubmitting}
-	err := svc.inner.UpdateMapfixIfStatus(ctx, MapfixID, allow_statuses, update)
-	if err != nil {
-		return nil, err
-	}
-
-	event_data := model.AuditEventDataAction{
-		TargetStatus: uint32(target_status),
-	}
-
-	err = svc.inner.CreateAuditEventAction(
-		ctx,
-		model.ValidatorUserID,
-		model.Resource{
-			ID: MapfixID,
-			Type: model.ResourceMapfix,
-		},
-		event_data,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// ActionMapfixValidate invokes actionMapfixValidate operation.
-//
-// Role Validator changes status from Validating -> Validated.
-//
-// POST /mapfixes/{MapfixID}/status/validator-validated
-func (svc *Mapfixes) SetStatusValidated(ctx context.Context, params *validator.MapfixID) (*validator.NullResponse, error) {
-	MapfixID := int64(params.ID)
-	// transaction
-	update := service.NewMapfixUpdate()
-	update.SetStatusID(model.MapfixStatusValidated)
-	allow_statuses := []model.MapfixStatus{model.MapfixStatusValidating}
-	err := svc.inner.UpdateMapfixIfStatus(ctx, MapfixID, allow_statuses, update)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// ActionMapfixAccepted implements actionMapfixAccepted operation.
-//
-// (Internal endpoint) Role Validator changes status from Validating -> Accepted.
-//
-// POST /mapfixes/{MapfixID}/status/validator-failed
-func (svc *Mapfixes) SetStatusFailed(ctx context.Context, params *validator.MapfixID) (*validator.NullResponse, error) {
-	MapfixID := int64(params.ID)
-	// transaction
-	target_status := model.MapfixStatusAcceptedUnvalidated
-	update := service.NewMapfixUpdate()
-	update.SetStatusID(target_status)
-	allow_statuses := []model.MapfixStatus{model.MapfixStatusValidating}
-	err := svc.inner.UpdateMapfixIfStatus(ctx, MapfixID, allow_statuses, update)
-	if err != nil {
-		return nil, err
-	}
-
-	// push an action audit event
-	event_data := model.AuditEventDataAction{
-		TargetStatus: uint32(target_status),
-	}
-
-	err = svc.inner.CreateAuditEventAction(
-		ctx,
-		model.ValidatorUserID,
-		model.Resource{
-			ID: MapfixID,
-			Type: model.ResourceMapfix,
-		},
-		event_data,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// ActionMapfixUploaded implements actionMapfixUploaded operation.
-//
-// (Internal endpoint) Role Validator changes status from Uploading -> Uploaded.
-//
-// POST /mapfixes/{MapfixID}/status/validator-uploaded
-func (svc *Mapfixes) SetStatusUploaded(ctx context.Context, params *validator.MapfixID) (*validator.NullResponse, error) {
-	MapfixID := int64(params.ID)
-	// transaction
-	target_status := model.MapfixStatusUploaded
-	update := service.NewMapfixUpdate()
-	update.SetStatusID(target_status)
-	allow_statuses := []model.MapfixStatus{model.MapfixStatusUploading}
-	err := svc.inner.UpdateMapfixIfStatus(ctx, MapfixID, allow_statuses, update)
-	if err != nil {
-		return nil, err
-	}
-
-	event_data := model.AuditEventDataAction{
-		TargetStatus: uint32(target_status),
-	}
-
-	err = svc.inner.CreateAuditEventAction(
-		ctx,
-		model.ValidatorUserID,
-		model.Resource{
-			ID: MapfixID,
-			Type: model.ResourceMapfix,
-		},
-		event_data,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// CreateMapfixAuditError implements createMapfixAuditError operation.
-//
-// Post an error to the audit log
-//
-// POST /mapfixes/{MapfixID}/error
-func (svc *Mapfixes) CreateAuditError(ctx context.Context, params *validator.AuditErrorRequest) (*validator.NullResponse, error) {
-	MapfixID := int64(params.ID)
-	event_data := model.AuditEventDataError{
-		Error: params.ErrorMessage,
-	}
-
-	err := svc.inner.CreateAuditEventError(
-		ctx,
-		model.ValidatorUserID,
-		model.Resource{
-			ID: MapfixID,
-			Type: model.ResourceMapfix,
-		},
-		event_data,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// CreateMapfixAuditCheckList implements createMapfixAuditCheckList operation.
-//
-// Post a checklist to the audit log
-//
-// POST /mapfixes/{MapfixID}/checklist
-func (svc *Mapfixes) CreateAuditChecklist(ctx context.Context, params *validator.AuditChecklistRequest) (*validator.NullResponse, error) {
-	MapfixID := int64(params.ID)
-	check_list := make([]model.Check, len(params.CheckList))
-	for i, check := range params.CheckList {
-		check_list[i] = model.Check{
-			Name:    check.Name,
-			Summary: check.Summary,
-			Passed:  check.Passed,
-		}
-	}
-
-	event_data := model.AuditEventDataCheckList{
-		CheckList: check_list,
-	}
-
-	err := svc.inner.CreateAuditEventCheckList(
-		ctx,
-		model.ValidatorUserID,
-		model.Resource{
-			ID: MapfixID,
-			Type: model.ResourceMapfix,
-		},
-		event_data,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// POST /mapfixes
-func (svc *Mapfixes) Create(ctx context.Context, request *validator.MapfixCreate) (*validator.MapfixID, error) {
-	var Submitter=request.AssetOwner;
-	// Check if an active mapfix with the same asset id exists
-	{
-		filter := service.NewMapfixFilter()
-		filter.SetAssetID(request.AssetID)
-		filter.SetAssetVersion(request.AssetVersion)
-		filter.SetStatuses(ActiveMapfixStatuses)
-		active_mapfixes, err := svc.inner.ListMapfixes(ctx, filter, model.Page{
-			Number: 1,
-			Size:   1,
-		},datastore.ListSortDisabled)
-		if err != nil {
-			return nil, err
-		}
-		if len(active_mapfixes) != 0{
-			return nil, ErrActiveMapfixSameAssetID
-		}
-	}
-
-	OperationID := int32(request.OperationID)
-	operation, err := svc.inner.GetOperation(ctx, OperationID)
-	if err != nil {
-		return nil, err
-	}
-
-	// check if user owns asset
-	// TODO: allow bypass by admin
-	if operation.Owner != Submitter {
-		return nil, ErrNotAssetOwner
-	}
-
-	mapfix, err := svc.inner.CreateMapfix(ctx, model.Mapfix{
-		ID:            0,
-		DisplayName:   request.DisplayName,
-		Creator:       request.Creator,
-		GameID:        request.GameID,
-		Submitter:     Submitter,
-		AssetID:       request.AssetID,
-		AssetVersion:  request.AssetVersion,
-		Completed:     false,
-		TargetAssetID: request.TargetAssetID,
-		StatusID:      model.MapfixStatusUnderConstruction,
-		Description:   request.Description,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	// mark the operation as completed and provide the path
-	params := service.NewOperationCompleteParams(fmt.Sprintf("/mapfixes/%d", mapfix.ID))
-	err = svc.inner.CompleteOperation(ctx, OperationID, params)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.MapfixID{
-		ID: uint64(mapfix.ID),
-	}, nil
-}

pkg/validator_controller/operations.go

@@ -1,37 +0,0 @@
-package validator_controller
-
-import (
-	"context"
-
-	"git.itzana.me/strafesnet/go-grpc/validator"
-	"git.itzana.me/strafesnet/maps-service/pkg/service"
-)
-
-type Operations struct {
-	*validator.UnimplementedValidatorOperationServiceServer
-	inner *service.Service
-}
-func NewOperationsController(
-	inner *service.Service,
-) Operations {
-	return Operations{
-		inner: inner,
-	}
-}
-
-// ActionOperationFailed implements actionOperationFailed operation.
-//
-// Fail the specified OperationID with a StatusMessage.
-//
-// POST /operations/{OperationID}/status/operation-failed
-func (svc *Operations) Fail(ctx context.Context, params *validator.OperationFailRequest) (*validator.NullResponse, error) {
-	fail_params := service.NewOperationFailParams(
-		params.StatusMessage,
-	)
-	err := svc.inner.FailOperation(ctx, int32(params.OperationID), fail_params)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}

pkg/validator_controller/script_policy.go

@@ -1,89 +0,0 @@
-package validator_controller
-
-import (
-	"context"
-
-	"git.itzana.me/strafesnet/go-grpc/validator"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service"
-)
-
-type ScriptPolicy struct {
-	*validator.UnimplementedValidatorScriptPolicyServiceServer
-	inner *service.Service
-}
-func NewScriptPolicyController(
-	inner *service.Service,
-) ScriptPolicy {
-	return ScriptPolicy{
-		inner: inner,
-	}
-}
-
-// CreateScriptPolicy implements createScriptPolicy operation.
-//
-// Create a new script policy.
-//
-// POST /script-policy
-func (svc *ScriptPolicy) Create(ctx context.Context, req *validator.ScriptPolicyCreate) (*validator.ScriptPolicyID, error) {
-	from_script, err := svc.inner.GetScript(ctx, int64(req.FromScriptID))
-	if err != nil {
-		return nil, err
-	}
-
-	// the existence of ToScriptID does not need to be validated because it's checked by a foreign key constraint.
-
-	script, err := svc.inner.CreateScriptPolicy(ctx, model.ScriptPolicy{
-		ID:             0,
-		FromScriptHash: from_script.Hash,
-		ToScriptID:     int64(req.ToScriptID),
-		Policy:         model.Policy(req.Policy),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.ScriptPolicyID{
-		ID: uint64(script.ID),
-	}, nil
-}
-
-// ListScriptPolicy implements listScriptPolicy operation.
-//
-// Get list of script policies.
-//
-// GET /script-policy
-func (svc *ScriptPolicy) List(ctx context.Context, params *validator.ScriptPolicyListRequest) (*validator.ScriptPolicyListResponse, error) {
-	filter := service.NewScriptPolicyFilter()
-
-	if params.Filter.FromScriptHash != nil {
-		filter.SetFromScriptHash(int64(*params.Filter.FromScriptHash))
-	}
-	if params.Filter.ToScriptID != nil {
-		filter.SetToScriptID(int64(*params.Filter.ToScriptID))
-	}
-	if params.Filter.Policy != nil {
-		filter.SetPolicy(int32(*params.Filter.Policy))
-	}
-
-	items, err := svc.inner.ListScriptPolicies(ctx, filter, model.Page{
-		Number: int32(params.Page.Number),
-		Size:   int32(params.Page.Size),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	resp := validator.ScriptPolicyListResponse{}
-	resp.ScriptPolicies = make([]*validator.ScriptPolicy, len(items))
-	for i, item := range items {
-		resp.ScriptPolicies[i] = &validator.ScriptPolicy{
-			ID:             uint64(item.ID),
-			FromScriptHash: uint64(item.FromScriptHash),
-			ToScriptID:     uint64(item.ToScriptID),
-			Policy:         validator.Policy(int32(item.Policy)),
-		}
-	}
-
-	return &resp, nil
-}

pkg/validator_controller/scripts.go

@@ -1,119 +0,0 @@
-package validator_controller
-
-import (
-	"context"
-
-	"git.itzana.me/strafesnet/go-grpc/validator"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service"
-)
-
-type Scripts struct {
-	*validator.UnimplementedValidatorScriptServiceServer
-	inner *service.Service
-}
-func NewScriptsController(
-	inner *service.Service,
-) Scripts {
-	return Scripts{
-		inner: inner,
-	}
-}
-
-// CreateScript implements createScript operation.
-//
-// Create a new script.
-//
-// POST /scripts
-func (svc *Scripts) Create(ctx context.Context, req *validator.ScriptCreate) (*validator.ScriptID, error) {
-	ResourceID := int64(0)
-	if req.ResourceID != nil {
-		ResourceID = int64(*req.ResourceID)
-	}
-	script, err := svc.inner.CreateScript(ctx, model.Script{
-		ID:           0,
-		Name:         req.Name,
-		Hash:         int64(model.HashSource(req.Source)),
-		Source:       req.Source,
-		ResourceType: model.ResourceType(req.ResourceType),
-		ResourceID:   ResourceID,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.ScriptID{
-		ID: uint64(script.ID),
-	}, nil
-}
-
-// ListScripts implements listScripts operation.
-//
-// Get list of scripts.
-//
-// GET /scripts
-func (svc *Scripts) List(ctx context.Context, params *validator.ScriptListRequest) (*validator.ScriptListResponse, error) {
-	filter := service.NewScriptFilter()
-	if params.Filter.Hash != nil {
-		filter.SetHash(int64(*params.Filter.Hash))
-	}
-	if params.Filter.Name != nil {
-		filter.SetName(*params.Filter.Name)
-	}
-	if params.Filter.Source != nil {
-		filter.SetSource(*params.Filter.Source)
-	}
-	if params.Filter.ResourceType != nil {
-		filter.SetResourceType(int32(*params.Filter.ResourceType))
-	}
-	if params.Filter.ResourceID != nil {
-		filter.SetResourceID(int64(*params.Filter.ResourceID))
-	}
-
-	items, err := svc.inner.ListScripts(ctx, filter, model.Page{
-		Number: int32(params.Page.Number),
-		Size:   int32(params.Page.Size),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	resp := validator.ScriptListResponse{}
-	resp.Scripts = make([]*validator.Script, len(items))
-	for i, item := range items {
-		resource_id := uint64(item.ResourceID)
-		resp.Scripts[i] = &validator.Script{
-			ID:           uint64(item.ID),
-			Name:         item.Name,
-			Hash:         uint64(item.Hash),
-			Source:       item.Source,
-			ResourceType: validator.ResourceType(item.ResourceType),
-			ResourceID:   &resource_id,
-		}
-	}
-
-	return &resp, nil
-}
-
-// GetScript implements getScript operation.
-//
-// Get the specified script by ID.
-//
-// GET /scripts/{ScriptID}
-func (svc *Scripts) Get(ctx context.Context, params *validator.ScriptID) (*validator.Script, error) {
-	ScriptID := int64(params.ID)
-	script, err := svc.inner.GetScript(ctx, ScriptID)
-	if err != nil {
-		return nil, err
-	}
-
-	ResourceID := uint64(script.ResourceID)
-	return &validator.Script{
-		ID:           uint64(script.ID),
-		Name:         script.Name,
-		Hash:         uint64(script.Hash),
-		Source:       script.Source,
-		ResourceType: validator.ResourceType(script.ResourceType),
-		ResourceID:   &ResourceID,
-	}, nil
-}

pkg/validator_controller/submissions.go

@@ -1,403 +0,0 @@
-package validator_controller
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"git.itzana.me/strafesnet/go-grpc/validator"
-	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service"
-)
-
-type Submissions struct {
-	*validator.UnimplementedValidatorSubmissionServiceServer
-	inner *service.Service
-}
-func NewSubmissionsController(
-	inner *service.Service,
-) Submissions {
-	return Submissions{
-		inner: inner,
-	}
-}
-
-var(
-	// prevent two mapfixes with same asset id
-	ActiveSubmissionStatuses = []model.SubmissionStatus{
-		model.SubmissionStatusUploading,
-		model.SubmissionStatusValidated,
-		model.SubmissionStatusValidating,
-		model.SubmissionStatusAcceptedUnvalidated,
-		model.SubmissionStatusChangesRequested,
-		model.SubmissionStatusSubmitted,
-		model.SubmissionStatusUnderConstruction,
-	}
-)
-
-var(
-	ErrActiveSubmissionSameAssetID = errors.New("There is an active submission with the same AssetID")
-)
-
-// UpdateSubmissionValidatedModel implements patchSubmissionModel operation.
-//
-// Update model following role restrictions.
-//
-// POST /submissions/{SubmissionID}/validated-model
-func (svc *Submissions) SetValidatedModel(ctx context.Context, params *validator.ValidatedModelRequest) (*validator.NullResponse, error) {
-	SubmissionID := int64(params.ID)
-
-	// check if Status is ChangesRequested|Submitted|UnderConstruction
-	update := service.NewSubmissionUpdate()
-	update.SetValidatedAssetID(params.ValidatedModelID)
-	update.SetValidatedAssetVersion(params.ValidatedModelVersion)
-	// DO NOT reset completed when validated model is updated
-	// update.Add("completed", false)
-	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusValidating}
-	err := svc.inner.UpdateSubmissionIfStatus(ctx, SubmissionID, allowed_statuses, update)
-	if err != nil {
-		return nil, err
-	}
-
-	event_data := model.AuditEventDataChangeValidatedModel{
-		ValidatedModelID: params.ValidatedModelID,
-		ValidatedModelVersion: params.ValidatedModelVersion,
-	}
-
-	err = svc.inner.CreateAuditEventChangeValidatedModel(
-		ctx,
-		model.ValidatorUserID,
-		model.Resource{
-			ID: SubmissionID,
-			Type: model.ResourceSubmission,
-		},
-		event_data,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// ActionSubmissionSubmitted invokes actionSubmissionSubmitted operation.
-//
-// Role Validator changes status from Submitting -> Submitted.
-//
-// POST /submissions/{SubmissionID}/status/validator-submitted
-func (svc *Submissions) SetStatusSubmitted(ctx context.Context, params *validator.SubmittedRequest) (*validator.NullResponse, error) {
-	SubmissionID := int64(params.ID)
-	// transaction
-	target_status := model.SubmissionStatusSubmitted
-	update := service.NewSubmissionUpdate()
-	update.SetStatusID(target_status)
-	update.SetAssetVersion(uint64(params.ModelVersion))
-	update.SetDisplayName(params.DisplayName)
-	update.SetCreator(params.Creator)
-	update.SetGameID(uint32(params.GameID))
-	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusSubmitting}
-	err := svc.inner.UpdateSubmissionIfStatus(ctx, SubmissionID, allowed_statuses, update)
-	if err != nil {
-		return nil, err
-	}
-
-	event_data := model.AuditEventDataAction{
-		TargetStatus: uint32(target_status),
-	}
-
-	err = svc.inner.CreateAuditEventAction(
-		ctx,
-		model.ValidatorUserID,
-		model.Resource{
-			ID: SubmissionID,
-			Type: model.ResourceSubmission,
-		},
-		event_data,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// ActionSubmissionRequestChanges implements actionSubmissionRequestChanges operation.
-//
-// (Internal endpoint) Role Validator changes status from Submitting -> RequestChanges.
-//
-// POST /submissions/{SubmissionID}/status/validator-request-changes
-func (svc *Submissions) SetStatusRequestChanges(ctx context.Context, params *validator.SubmissionID) (*validator.NullResponse, error) {
-	SubmissionID := int64(params.ID)
-	// transaction
-	target_status := model.SubmissionStatusChangesRequested
-	update := service.NewSubmissionUpdate()
-	update.SetStatusID(target_status)
-	allowed_statuses :=[]model.SubmissionStatus{model.SubmissionStatusSubmitting}
-	err := svc.inner.UpdateSubmissionIfStatus(ctx, SubmissionID, allowed_statuses, update)
-	if err != nil {
-		return nil, err
-	}
-
-	// push an action audit event
-	event_data := model.AuditEventDataAction{
-		TargetStatus: uint32(target_status),
-	}
-
-	err = svc.inner.CreateAuditEventAction(
-		ctx,
-		model.ValidatorUserID,
-		model.Resource{
-			ID: SubmissionID,
-			Type: model.ResourceSubmission,
-		},
-		event_data,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// ActionSubmissionValidate invokes actionSubmissionValidate operation.
-//
-// Role Validator changes status from Validating -> Validated.
-//
-// POST /submissions/{SubmissionID}/status/validator-validated
-func (svc *Submissions) SetStatusValidated(ctx context.Context, params *validator.SubmissionID) (*validator.NullResponse, error) {
-	SubmissionID := int64(params.ID)
-	// transaction
-	target_status := model.SubmissionStatusValidated
-	update := service.NewSubmissionUpdate()
-	update.SetStatusID(target_status)
-	allowed_statuses :=[]model.SubmissionStatus{model.SubmissionStatusValidating}
-	err := svc.inner.UpdateSubmissionIfStatus(ctx, SubmissionID, allowed_statuses, update)
-	if err != nil {
-		return nil, err
-	}
-
-	event_data := model.AuditEventDataAction{
-		TargetStatus: uint32(target_status),
-	}
-
-	err = svc.inner.CreateAuditEventAction(
-		ctx,
-		model.ValidatorUserID,
-		model.Resource{
-			ID: SubmissionID,
-			Type: model.ResourceSubmission,
-		},
-		event_data,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// ActionSubmissionAccepted implements actionSubmissionAccepted operation.
-//
-// (Internal endpoint) Role Validator changes status from Validating -> Accepted.
-//
-// POST /submissions/{SubmissionID}/status/validator-failed
-func (svc *Submissions) SetStatusFailed(ctx context.Context, params *validator.SubmissionID) (*validator.NullResponse, error) {
-	SubmissionID := int64(params.ID)
-	// transaction
-	target_status := model.SubmissionStatusAcceptedUnvalidated
-	update := service.NewSubmissionUpdate()
-	update.SetStatusID(target_status)
-	allowed_statuses :=[]model.SubmissionStatus{model.SubmissionStatusValidating}
-	err := svc.inner.UpdateSubmissionIfStatus(ctx, SubmissionID, allowed_statuses, update)
-	if err != nil {
-		return nil, err
-	}
-
-	// push an action audit event
-	event_data := model.AuditEventDataAction{
-		TargetStatus: uint32(target_status),
-	}
-
-	err = svc.inner.CreateAuditEventAction(
-		ctx,
-		model.ValidatorUserID,
-		model.Resource{
-			ID: SubmissionID,
-			Type: model.ResourceSubmission,
-		},
-		event_data,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// ActionSubmissionUploaded implements actionSubmissionUploaded operation.
-//
-// (Internal endpoint) Role Validator changes status from Uploading -> Uploaded.
-//
-// POST /submissions/{SubmissionID}/status/validator-uploaded
-func (svc *Submissions) SetStatusUploaded(ctx context.Context, params *validator.StatusUploadedRequest) (*validator.NullResponse, error) {
-	SubmissionID := int64(params.ID)
-	// transaction
-	target_status := model.SubmissionStatusUploaded
-	update := service.NewSubmissionUpdate()
-	update.SetStatusID(target_status)
-	update.SetUploadedAssetID(params.UploadedAssetID)
-	allowed_statuses :=[]model.SubmissionStatus{model.SubmissionStatusUploading}
-	err := svc.inner.UpdateSubmissionIfStatus(ctx, SubmissionID, allowed_statuses, update)
-	if err != nil {
-		return nil, err
-	}
-
-	event_data := model.AuditEventDataAction{
-		TargetStatus: uint32(target_status),
-	}
-
-	err = svc.inner.CreateAuditEventAction(
-		ctx,
-		model.ValidatorUserID,
-		model.Resource{
-			ID: SubmissionID,
-			Type: model.ResourceSubmission,
-		},
-		event_data,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// CreateSubmissionAuditError implements createSubmissionAuditError operation.
-//
-// Post an error to the audit log
-//
-// POST /submissions/{SubmissionID}/error
-func (svc *Submissions) CreateAuditError(ctx context.Context, params *validator.AuditErrorRequest) (*validator.NullResponse, error) {
-	SubmissionID := int64(params.ID)
-	event_data := model.AuditEventDataError{
-		Error: params.ErrorMessage,
-	}
-
-	err := svc.inner.CreateAuditEventError(
-		ctx,
-		model.ValidatorUserID,
-		model.Resource{
-			ID: SubmissionID,
-			Type: model.ResourceSubmission,
-		},
-		event_data,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// CreateSubmissionAuditCheckList implements createSubmissionAuditCheckList operation.
-//
-// Post a checklist to the audit log
-//
-// POST /submissions/{SubmissionID}/checklist
-func (svc *Submissions) CreateAuditChecklist(ctx context.Context, params *validator.AuditChecklistRequest) (*validator.NullResponse, error) {
-	SubmissionID := int64(params.ID)
-	check_list := make([]model.Check, len(params.CheckList))
-	for i, check := range params.CheckList {
-		check_list[i] = model.Check{
-			Name:    check.Name,
-			Summary: check.Summary,
-			Passed:  check.Passed,
-		}
-	}
-
-	event_data := model.AuditEventDataCheckList{
-		CheckList: check_list,
-	}
-
-	err := svc.inner.CreateAuditEventCheckList(
-		ctx,
-		model.ValidatorUserID,
-		model.Resource{
-			ID: SubmissionID,
-			Type: model.ResourceSubmission,
-		},
-		event_data,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.NullResponse{}, nil
-}
-
-// POST /submissions
-func (svc *Submissions) Create(ctx context.Context, request *validator.SubmissionCreate) (*validator.SubmissionID, error) {
-	var Submitter=uint64(request.AssetOwner);
-	var Status=model.SubmissionStatus(request.Status);
-	var roles=model.Roles(request.Roles);
-
-	// Check if an active submission with the same asset id exists
-	{
-		filter := service.NewSubmissionFilter()
-		filter.SetAssetID(request.AssetID)
-		filter.SetAssetVersion(request.AssetVersion)
-		filter.SetStatuses(ActiveSubmissionStatuses)
-		active_submissions, err := svc.inner.ListSubmissions(ctx, filter, model.Page{
-			Number: 1,
-			Size:   1,
-		},datastore.ListSortDisabled)
-		if err != nil {
-			return nil, err
-		}
-		if len(active_submissions) != 0{
-			return nil, ErrActiveSubmissionSameAssetID
-		}
-	}
-
-	operation_id := int32(request.OperationID)
-	operation, err := svc.inner.GetOperation(ctx, operation_id)
-	if err != nil {
-		return nil, err
-	}
-
-	// check if user owns asset
-	is_submitter := operation.Owner == Submitter
-	// check if user is map admin
-	has_submission_review := roles & model.RolesSubmissionReview == model.RolesSubmissionReview
-	// if neither, u not allowed
-	if !is_submitter && !has_submission_review {
-		return nil, ErrNotAssetOwner
-	}
-
-	submission, err := svc.inner.CreateSubmission(ctx, model.Submission{
-		ID:            0,
-		DisplayName:   request.DisplayName,
-		Creator:       request.Creator,
-		GameID:        request.GameID,
-		Submitter:     Submitter,
-		AssetID:       request.AssetID,
-		AssetVersion:  request.AssetVersion,
-		Completed:     false,
-		StatusID:      Status,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	// mark the operation as completed and provide the path
-	params := service.NewOperationCompleteParams(fmt.Sprintf("/submissions/%d", submission.ID))
-	err = svc.inner.CompleteOperation(ctx, operation_id, params)
-	if err != nil {
-		return nil, err
-	}
-
-	return &validator.SubmissionID{
-		ID: uint64(submission.ID),
-	}, nil
-}

pkg/web_api/maps.go

@@ -1,140 +0,0 @@
-package web_api
-
-import (
-	"context"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/api"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/roblox"
-	"git.itzana.me/strafesnet/maps-service/pkg/service"
-)
-
-// MigrateMaps implements migrateMaps operation.
-//
-// Perform maps migration.
-//
-// POST /migrate
-func (svc *Service) MigrateMaps(ctx context.Context) (error) {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
-	if !ok {
-		return ErrUserInfo
-	}
-
-	has_role, err := userInfo.HasRoleSubmissionRelease()
-	if err != nil {
-		return err
-	}
-
-	if !has_role {
-		return ErrPermissionDeniedNeedRoleSubmissionRelease
-	}
-
-	return svc.inner.TEMP_DoMapsMigration(ctx)
-}
-
-// ListMaps implements listMaps operation.
-//
-// Get list of maps.
-//
-// GET /maps
-func (svc *Service) ListMaps(ctx context.Context, params api.ListMapsParams) ([]api.Map, error) {
-	filter := service.NewMapFilter()
-
-	if display_name, display_name_ok := params.DisplayName.Get(); display_name_ok{
-		filter.SetDisplayName(display_name)
-	}
-	if creator, creator_ok := params.Creator.Get(); creator_ok{
-		filter.SetCreator(creator)
-	}
-	if game_id, game_id_ok := params.GameID.Get(); game_id_ok{
-		filter.SetGameID(uint32(game_id))
-	}
-
-	items, err := svc.inner.ListMaps(ctx,
-		filter,
-		model.Page{
-			Size:   params.Limit,
-			Number: params.Page,
-		},
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	var resp []api.Map
-	for _, item := range items {
-		resp = append(resp, api.Map{
-			ID:           item.ID,
-			DisplayName:  item.DisplayName,
-			Creator:      item.Creator,
-			GameID:       int32(item.GameID),
-			Date:         item.Date.Unix(),
-		})
-	}
-
-	return resp, nil
-}
-
-// GetMap implements getScript operation.
-//
-// Get the specified script by ID.
-//
-// GET /maps/{MapID}
-func (svc *Service) GetMap(ctx context.Context, params api.GetMapParams) (*api.Map, error) {
-	mapResponse, err := svc.inner.GetMap(ctx, params.MapID)
-	if err != nil {
-		return nil, err
-	}
-
-	return &api.Map{
-		ID:           mapResponse.ID,
-		DisplayName:  mapResponse.DisplayName,
-		Creator:      mapResponse.Creator,
-		GameID:       int32(mapResponse.GameID),
-		Date:         mapResponse.Date.Unix(),
-	}, nil
-}
-
-// DownloadMapAsset invokes downloadMapAsset operation.
-//
-// Download the map asset.
-//
-// GET /maps/{MapID}/download
-func (svc *Service) DownloadMapAsset(ctx context.Context, params api.DownloadMapAssetParams) (ok api.DownloadMapAssetOK, err error) {
-	userInfo, success := ctx.Value("UserInfo").(UserInfoHandle)
-	if !success {
-		return ok, ErrUserInfo
-	}
-
-	has_role, err := userInfo.HasRoleMapDownload()
-	if err != nil {
-		return ok, err
-	}
-
-	if !has_role {
-		return ok, ErrPermissionDeniedNeedRoleMapDownload
-	}
-
-	// Ensure map exists in the db!
-	// This could otherwise be used to access any asset
-	_, err = svc.inner.GetMap(ctx, params.MapID)
-	if err != nil {
-		return ok, err
-	}
-
-	info, err := svc.roblox.GetAssetLocation(roblox.GetAssetLatestRequest{
-		AssetID: uint64(params.MapID),
-	})
-	if err != nil{
-		return ok, err
-	}
-
-	// download the complete file
-	asset, err := svc.roblox.DownloadAsset(info)
-	if err != nil{
-		return ok, err
-	}
-
-	ok.Data = asset
-	return ok, nil
-}

pkg/web_api/operations.go

@@ -1,46 +0,0 @@
-package web_api
-
-import (
-	"context"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/api"
-)
-
-// GetOperation implements getOperation operation.
-//
-// Get the specified operation by ID.
-//
-// GET /operations/{OperationID}
-func (svc *Service) GetOperation(ctx context.Context, params api.GetOperationParams) (*api.Operation, error) {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
-	if !ok {
-		return nil, ErrUserInfo
-	}
-
-	// You must be the operation owner to read it
-
-	operation, err := svc.inner.GetOperation(ctx, params.OperationID)
-	if err != nil {
-		return nil, err
-	}
-
-	userId, err := userInfo.GetUserID()
-	if err != nil {
-		return nil, err
-	}
-
-	// check if caller is the submitter
-	has_role := userId == operation.Owner
-	if !has_role {
-		return nil, ErrPermissionDeniedNotSubmitter
-	}
-
-	return &api.Operation{
-		OperationID:   operation.ID,
-		Date:          operation.CreatedAt.Unix(),
-		Owner:         int64(operation.Owner),
-		Status:        int32(operation.StatusID),
-		StatusMessage: operation.StatusMessage,
-		Path:          operation.Path,
-	}, nil
-}

pkg/web_api/script_policy.go

@@ -1,149 +0,0 @@
-package web_api
-
-import (
-	"context"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/api"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service"
-)
-
-// CreateScriptPolicy implements createScriptPolicy operation.
-//
-// Create a new script policy.
-//
-// POST /script-policy
-func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolicyCreate) (*api.ScriptPolicyID, error) {
-	err := CheckHasRoleScriptWrite(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	from_script, err := svc.inner.GetScript(ctx, req.FromScriptID)
-	if err != nil {
-		return nil, err
-	}
-
-	// the existence of ToScriptID does not need to be validated because it's checked by a foreign key constraint.
-
-	script, err := svc.inner.CreateScriptPolicy(ctx, model.ScriptPolicy{
-		ID:             0,
-		FromScriptHash: from_script.Hash,
-		ToScriptID:     req.ToScriptID,
-		Policy:         model.Policy(req.Policy),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return &api.ScriptPolicyID{
-		ScriptPolicyID: script.ID,
-	}, nil
-}
-
-
-// ListScriptPolicy implements listScriptPolicy operation.
-//
-// Get list of script policies.
-//
-// GET /script-policy
-func (svc *Service) ListScriptPolicy(ctx context.Context, params api.ListScriptPolicyParams) ([]api.ScriptPolicy, error) {
-	filter := service.NewScriptPolicyFilter()
-
-	if hash_hex, ok := params.FromScriptHash.Get(); ok{
-		hash_parsed, err := model.HashParse(hash_hex)
-		if err != nil {
-			return nil, err
-		}
-		filter.SetFromScriptHash(int64(hash_parsed))
-	}
-	if to_script_id, to_script_id_ok := params.ToScriptID.Get(); to_script_id_ok{
-		filter.SetToScriptID(to_script_id)
-	}
-	if policy, policy_ok := params.Policy.Get(); policy_ok{
-		filter.SetPolicy(policy)
-	}
-
-
-	items, err := svc.inner.ListScriptPolicies(ctx, filter, model.Page{
-		Number: params.Page,
-		Size:   params.Limit,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	var resp []api.ScriptPolicy
-	for _, item := range items {
-		resp = append(resp, api.ScriptPolicy{
-			ID:             item.ID,
-			FromScriptHash: model.HashFormat(uint64(item.FromScriptHash)),
-			ToScriptID:     item.ToScriptID,
-			Policy:         int32(item.Policy),
-		})
-	}
-
-	return resp, nil
-}
-
-// DeleteScriptPolicy implements deleteScriptPolicy operation.
-//
-// Delete the specified script policy by ID.
-//
-// DELETE /script-policy/{ScriptPolicyID}
-func (svc *Service) DeleteScriptPolicy(ctx context.Context, params api.DeleteScriptPolicyParams) error {
-	err := CheckHasRoleScriptWrite(ctx)
-	if err != nil {
-		return err
-	}
-
-	return svc.inner.DeleteScriptPolicy(ctx, params.ScriptPolicyID)
-}
-
-// GetScriptPolicy implements getScriptPolicy operation.
-//
-// Get the specified script policy by ID.
-//
-// GET /script-policy/{ScriptPolicyID}
-func (svc *Service) GetScriptPolicy(ctx context.Context, params api.GetScriptPolicyParams) (*api.ScriptPolicy, error) {
-	policy, err := svc.inner.GetScriptPolicy(ctx, params.ScriptPolicyID)
-	if err != nil {
-		return nil, err
-	}
-
-	return &api.ScriptPolicy{
-		ID:             policy.ID,
-		FromScriptHash: model.HashFormat(uint64(policy.FromScriptHash)),
-		ToScriptID:     policy.ToScriptID,
-		Policy:         int32(policy.Policy),
-	}, nil
-}
-
-// UpdateScriptPolicy implements updateScriptPolicy operation.
-//
-// Update the specified script policy by ID.
-//
-// POST /script-policy/{ScriptPolicyID}
-func (svc *Service) UpdateScriptPolicy(ctx context.Context, req *api.ScriptPolicyUpdate, params api.UpdateScriptPolicyParams) error {
-	err := CheckHasRoleScriptWrite(ctx)
-	if err != nil {
-		return err
-	}
-
-	filter := service.NewScriptPolicyFilter()
-	if from_script_id, ok := req.FromScriptID.Get(); ok {
-		from_script, err := svc.inner.GetScript(ctx, from_script_id)
-		if err != nil {
-			return err
-		}
-		filter.SetFromScriptHash(from_script.Hash)
-	}
-	if to_script_id, to_script_id_ok := req.ToScriptID.Get(); to_script_id_ok{
-		filter.SetToScriptID(to_script_id)
-	}
-	if policy, policy_ok := req.Policy.Get(); policy_ok{
-		filter.SetPolicy(policy)
-	}
-
-	return svc.inner.UpdateScriptPolicy(ctx, req.ID, filter)
-}

pkg/web_api/scripts.go

@@ -1,170 +0,0 @@
-package web_api
-
-import (
-	"context"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/api"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service"
-)
-
-func CheckHasRoleScriptWrite(ctx context.Context) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
-	if !ok {
-		return ErrUserInfo
-	}
-
-	has_role, err := userInfo.HasRoleScriptWrite()
-	if err != nil {
-		return err
-	}
-	if !has_role {
-		return ErrPermissionDeniedNeedRoleScriptWrite
-	}
-
-	return nil
-}
-
-// CreateScript implements createScript operation.
-//
-// Create a new script.
-//
-// POST /scripts
-func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*api.ScriptID, error) {
-	err := CheckHasRoleScriptWrite(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	script, err := svc.inner.CreateScript(ctx, model.Script{
-		ID:           0,
-		Name:         req.Name,
-		Hash:         int64(model.HashSource(req.Source)),
-		Source:       req.Source,
-		ResourceType: model.ResourceType(req.ResourceType),
-		ResourceID:   req.ResourceID.Or(0),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return &api.ScriptID{
-		ScriptID: script.ID,
-	}, nil
-}
-
-// ListScripts implements listScripts operation.
-//
-// Get list of scripts.
-//
-// GET /scripts
-func (svc *Service) ListScripts(ctx context.Context, params api.ListScriptsParams) ([]api.Script, error) {
-	filter := service.NewScriptFilter()
-
-	if hash_hex, ok := params.Hash.Get(); ok{
-		hash_parsed, err := model.HashParse(hash_hex)
-		if err != nil {
-			return nil, err
-		}
-		filter.SetHash(int64(hash_parsed))
-	}
-	if name, name_ok := params.Name.Get(); name_ok{
-		filter.SetName(name)
-	}
-	if source, source_ok := params.Source.Get(); source_ok{
-		filter.SetSource(source)
-	}
-	if resource_type, resource_type_ok := params.ResourceType.Get(); resource_type_ok{
-		filter.SetResourceType(resource_type)
-	}
-	if resource_id, resource_id_ok := params.ResourceID.Get(); resource_id_ok{
-		filter.SetResourceID(resource_id)
-	}
-
-
-	items, err := svc.inner.ListScripts(ctx, filter, model.Page{
-		Number: params.Page,
-		Size:   params.Limit,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	var resp []api.Script
-	for _, item := range items {
-		resp = append(resp, api.Script{
-			ID:           item.ID,
-			Name:         item.Name,
-			Hash:         model.HashFormat(uint64(item.Hash)),
-			Source:       item.Source,
-			ResourceType: int32(item.ResourceType),
-			ResourceID:   item.ResourceID,
-		})
-	}
-
-	return resp, nil
-}
-
-// DeleteScript implements deleteScript operation.
-//
-// Delete the specified script by ID.
-//
-// DELETE /scripts/{ScriptID}
-func (svc *Service) DeleteScript(ctx context.Context, params api.DeleteScriptParams) error {
-	err := CheckHasRoleScriptWrite(ctx)
-	if err != nil {
-		return err
-	}
-
-	return svc.inner.DeleteScript(ctx, params.ScriptID)
-}
-
-// GetScript implements getScript operation.
-//
-// Get the specified script by ID.
-//
-// GET /scripts/{ScriptID}
-func (svc *Service) GetScript(ctx context.Context, params api.GetScriptParams) (*api.Script, error) {
-	script, err := svc.inner.GetScript(ctx, params.ScriptID)
-	if err != nil {
-		return nil, err
-	}
-
-	return &api.Script{
-		ID:           script.ID,
-		Name:         script.Name,
-		Hash:         model.HashFormat(uint64(script.Hash)),
-		Source:       script.Source,
-		ResourceType: int32(script.ResourceType),
-		ResourceID:   script.ResourceID,
-	}, nil
-}
-
-// UpdateScript implements updateScript operation.
-//
-// Update the specified script by ID.
-//
-// PATCH /scripts/{ScriptID}
-func (svc *Service) UpdateScript(ctx context.Context, req *api.ScriptUpdate, params api.UpdateScriptParams) error {
-	err := CheckHasRoleScriptWrite(ctx)
-	if err != nil {
-		return err
-	}
-
-	filter := service.NewScriptFilter()
-	if name, name_ok := req.Name.Get(); name_ok{
-		filter.SetName(name)
-	}
-	if source, source_ok := req.Source.Get(); source_ok{
-		filter.SetSource(source)
-		filter.SetHash(int64(model.HashSource(source)))
-	}
-	if resource_type, resource_type_ok := req.ResourceType.Get(); resource_type_ok{
-		filter.SetResourceType(resource_type)
-	}
-	if resource_id, resource_id_ok := req.ResourceID.Get(); resource_id_ok{
-		filter.SetResourceID(resource_id)
-	}
-
-	return svc.inner.UpdateScript(ctx, req.ID, filter)
-}

pkg/web_api/security.go

@@ -1,140 +0,0 @@
-package web_api
-
-import (
-	"context"
-	"errors"
-
-	"git.itzana.me/strafesnet/go-grpc/auth"
-	"git.itzana.me/strafesnet/maps-service/pkg/api"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-)
-
-var (
-	// ErrMissingSessionID there is no session id
-	ErrMissingSessionID = errors.New("SessionID missing")
-	// ErrInvalidSession caller does not have a valid session
-	ErrInvalidSession = errors.New("Session invalid")
-)
-
-type UserInfoHandle struct {
-	// Would love to know a better way to do this
-	svc       *SecurityHandler
-	ctx       *context.Context
-	sessionId string
-}
-type UserInfo struct {
-	UserID    uint64
-	Username  string
-	AvatarURL string
-}
-
-func (usr UserInfoHandle) GetUserInfo() (userInfo UserInfo, err error) {
-	session, err := usr.svc.Client.GetSessionUser(*usr.ctx, &auth.IdMessage{
-		SessionID: usr.sessionId,
-	})
-	if err != nil {
-		return userInfo, err
-	}
-	userInfo.UserID = session.UserID
-	userInfo.Username = session.Username
-	userInfo.AvatarURL = session.AvatarURL
-	return userInfo, nil
-}
-func (usr UserInfoHandle) GetUserID() (uint64, error) {
-	session, err := usr.svc.Client.GetSessionUser(*usr.ctx, &auth.IdMessage{
-		SessionID: usr.sessionId,
-	})
-	if err != nil {
-		return 0, err
-	}
-	return session.UserID, nil
-}
-func (usr UserInfoHandle) Validate() (bool, error) {
-	validate, err := usr.svc.Client.ValidateSession(*usr.ctx, &auth.IdMessage{
-		SessionID: usr.sessionId,
-	})
-	if err != nil {
-		return false, err
-	}
-	return validate.Valid, nil
-}
-func (usr UserInfoHandle) hasRoles(wantRoles model.Roles) (bool, error) {
-	haveroles, err := usr.GetRoles()
-	if err != nil {
-		return false, err
-	}
-
-	return haveroles & wantRoles == wantRoles, nil
-}
-func (usr UserInfoHandle) GetRoles() (model.Roles, error) {
-	roles, err := usr.svc.Client.GetGroupRole(*usr.ctx, &auth.IdMessage{
-		SessionID: usr.sessionId,
-	})
-
-	if err != nil {
-		return model.RolesEmpty, err
-	}
-
-	// map roles into bitflag
-	rolesBitflag := model.RolesEmpty;
-	for _, r := range roles.Roles {
-		switch model.GroupRole(r.Rank){
-		case model.RoleQuat, model.RoleItzaname, model.RoleStagingDeveloper:
-		rolesBitflag|=model.RolesAll
-		case model.RoleMapAdmin:
-		rolesBitflag|=model.RolesMapAdmin
-		case model.RoleMapCouncil:
-		rolesBitflag|=model.RolesMapCouncil
-		case model.RoleMapAccess:
-		rolesBitflag|=model.RolesMapAccess
-		}
-	}
-	return rolesBitflag, nil
-}
-
-// RoleThumbnail
-func (usr UserInfoHandle) HasRoleMapfixUpload() (bool, error) {
-	return usr.hasRoles(model.RolesMapfixUpload)
-}
-func (usr UserInfoHandle) HasRoleMapfixReview() (bool, error) {
-	return usr.hasRoles(model.RolesMapfixReview)
-}
-func (usr UserInfoHandle) HasRoleMapDownload() (bool, error) {
-	return usr.hasRoles(model.RolesMapDownload)
-}
-func (usr UserInfoHandle) HasRoleSubmissionRelease() (bool, error) {
-	return usr.hasRoles(model.RolesSubmissionRelease)
-}
-func (usr UserInfoHandle) HasRoleSubmissionUpload() (bool, error) {
-	return usr.hasRoles(model.RolesSubmissionUpload)
-}
-func (usr UserInfoHandle) HasRoleSubmissionReview() (bool, error) {
-	return usr.hasRoles(model.RolesSubmissionReview)
-}
-func (usr UserInfoHandle) HasRoleScriptWrite() (bool, error) {
-	return usr.hasRoles(model.RolesScriptWrite)
-}
-/// Not implemented
-func (usr UserInfoHandle) HasRoleMaptest() (bool, error) {
-	println("HasRoleMaptest is not implemented!")
-	return false, nil
-}
-
-type SecurityHandler struct {
-	Client auth.AuthServiceClient
-}
-
-func (svc SecurityHandler) HandleCookieAuth(ctx context.Context, operationName api.OperationName, t api.CookieAuth) (context.Context, error) {
-	sessionId := t.GetAPIKey()
-	if sessionId == "" {
-		return nil, ErrMissingSessionID
-	}
-
-	newCtx := context.WithValue(ctx, "UserInfo", UserInfoHandle{
-		svc:       &svc,
-		ctx:       &ctx,
-		sessionId: sessionId,
-	})
-
-	return newCtx, nil
-}

pkg/web_api/service.go

@@ -1,68 +0,0 @@
-package web_api
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/api"
-	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
-	"git.itzana.me/strafesnet/maps-service/pkg/roblox"
-	"git.itzana.me/strafesnet/maps-service/pkg/service"
-)
-
-var (
-	// ErrPermissionDenied caller does not have the required role
-	ErrPermissionDenied = errors.New("Permission denied")
-	// ErrUserInfo user info is missing for some reason
-	ErrUserInfo = errors.New("Missing user info")
-	ErrDelayReset = errors.New("Please give the validator at least 10 seconds to operate before attempting to reset the status")
-	ErrPermissionDeniedNotSubmitter = fmt.Errorf("%w: You must be the submitter to perform this action", ErrPermissionDenied)
-	ErrPermissionDeniedNeedRoleSubmissionRelease = fmt.Errorf("%w: Need Role SubmissionRelease", ErrPermissionDenied)
-	ErrPermissionDeniedNeedRoleMapfixUpload = fmt.Errorf("%w: Need Role MapfixUpload", ErrPermissionDenied)
-	ErrPermissionDeniedNeedRoleMapfixReview = fmt.Errorf("%w: Need Role MapfixReview", ErrPermissionDenied)
-	ErrPermissionDeniedNeedRoleSubmissionUpload = fmt.Errorf("%w: Need Role SubmissionUpload", ErrPermissionDenied)
-	ErrPermissionDeniedNeedRoleSubmissionReview = fmt.Errorf("%w: Need Role SubmissionReview", ErrPermissionDenied)
-	ErrPermissionDeniedNeedRoleMapDownload = fmt.Errorf("%w: Need Role MapDownload", ErrPermissionDenied)
-	ErrPermissionDeniedNeedRoleScriptWrite = fmt.Errorf("%w: Need Role ScriptWrite", ErrPermissionDenied)
-	ErrPermissionDeniedNeedRoleMaptest = fmt.Errorf("%w: Need Role Maptest", ErrPermissionDenied)
-	ErrNegativeID = errors.New("A negative ID was provided")
-)
-
-type Service struct {
-	inner *service.Service
-	roblox roblox.Client
-}
-
-func NewService(
-	inner *service.Service,
-	roblox roblox.Client,
-) Service {
-	return Service{
-		inner: inner,
-		roblox: roblox,
-	}
-}
-
-// NewError creates *ErrorStatusCode from error returned by handler.
-//
-// Used for common default response.
-func (svc *Service) NewError(ctx context.Context, err error) *api.ErrorStatusCode {
-	status := 500
-	if errors.Is(err, datastore.ErrNotExist) {
-		status = 404
-	}
-	if errors.Is(err, ErrPermissionDenied) {
-		status = 403
-	}
-	if errors.Is(err, ErrUserInfo) {
-		status = 401
-	}
-	return &api.ErrorStatusCode{
-		StatusCode: status,
-		Response: api.Error{
-			Code:    int64(status),
-			Message: err.Error(),
-		},
-	}
-}

pkg/web_api/session.go

@@ -1,68 +0,0 @@
-package web_api
-
-import (
-	"context"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/api"
-)
-
-// SessionRoles implements getSessionRoles operation.
-//
-// Get bitflags of permissions the currently logged in user has.
-//
-// GET /session/roles
-func (svc *Service) SessionRoles(ctx context.Context) (*api.Roles, error) {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
-	if !ok {
-		return nil, ErrUserInfo
-	}
-
-	roles, err := userInfo.GetRoles();
-	if err != nil {
-		return nil, err
-	}
-
-	return &api.Roles{Roles: int32(roles)}, nil
-}
-
-// SessionUser implements sessionUser operation.
-//
-// Get information about the currently logged in user.
-//
-// GET /session/roles
-func (svc *Service) SessionUser(ctx context.Context) (*api.User, error) {
-	userInfoHandle, ok := ctx.Value("UserInfo").(UserInfoHandle)
-	if !ok {
-		return nil, ErrUserInfo
-	}
-
-	userInfo, err := userInfoHandle.GetUserInfo();
-	if err != nil {
-		return nil, err
-	}
-
-	return &api.User{
-		UserID:int64(userInfo.UserID),
-		Username:userInfo.Username,
-		AvatarURL:userInfo.AvatarURL,
-	}, nil
-}
-
-// SessionUser implements sessionUser operation.
-//
-// Get information about the currently logged in user.
-//
-// GET /session/roles
-func (svc *Service) SessionValidate(ctx context.Context) (bool, error) {
-	userInfoHandle, ok := ctx.Value("UserInfo").(UserInfoHandle)
-	if !ok {
-		return false, ErrUserInfo
-	}
-
-	valid, err := userInfoHandle.Validate();
-	if err != nil {
-		return false, err
-	}
-
-	return valid, nil
-}

validation/Cargo.toml

@@ -1,21 +1,20 @@
 [package]
 name = "maps-validation"
-version = "0.1.1"
+version = "0.1.0"
-edition = "2024"
+edition = "2021"
 
 [dependencies]
-async-nats = "0.42.0"
+api = { path = "api" }
+async-nats = "0.38.0"
 futures = "0.3.31"
-rbx_asset = { version = "0.4.7", registry = "strafesnet" }
+rbx_asset = { version = "0.2.3", registry = "strafesnet" }
-rbx_binary = "1.0.0"
+rbx_binary = { version = "0.7.4", registry = "strafesnet"}
-rbx_dom_weak = "3.0.0"
+rbx_dom_weak = { version = "2.9.0", registry = "strafesnet"}
-rbx_reflection_database = "1.0.3"
+rbx_reflection_database = { version = "0.2.12", registry = "strafesnet"}
-rbx_xml = "1.0.0"
+rbx_xml = { version = "0.13.3", registry = "strafesnet"}
+rust-grpc = { version = "1.0.3", registry = "strafesnet" }
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0.133"
 siphasher = "1.0.1"
-tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread", "signal"] }
+tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread", "fs"] }
-heck = "0.5.0"
+tonic = "0.12.3"
-lazy-regex = "3.4.1"
-rust-grpc = { version = "1.2.1", registry = "strafesnet" }
-tonic = "0.13.1"

validation/Containerfile

@@ -1,6 +1,6 @@
 # Using the `rust-musl-builder` as base image, instead of
 # the official Rust toolchain
-FROM registry.itzana.me/docker-proxy/clux/muslrust:1.86.0-stable AS chef
+FROM docker.io/clux/muslrust:stable AS chef
 USER root
 RUN cargo install cargo-chef
 WORKDIR /app
@@ -17,7 +17,7 @@ RUN cargo chef cook --release --target x86_64-unknown-linux-musl --recipe-path r
 COPY . .
 RUN cargo build --release --target x86_64-unknown-linux-musl --bin maps-validation
 
-FROM registry.itzana.me/docker-proxy/alpine:3.21 AS runtime
+FROM docker.io/alpine:latest AS runtime
 RUN addgroup -S myuser && adduser -S myuser -G myuser
 COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/maps-validation /usr/local/bin/
 USER myuser

validation/api/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
-name = "submissions-api"
+name = "api"
-version = "0.8.2"
+version = "0.1.0"
-edition = "2024"
+edition = "2021"
 publish = ["strafesnet"]
 repository = "https://git.itzana.me/StrafesNET/maps-service"
 license = "MIT OR Apache-2.0"
@@ -11,9 +11,7 @@ authors = ["Rhys Lloyd <krakow20@gmail.com>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-chrono = { version = "0.4.41", features = ["serde"] }
 reqwest = { version = "0", features = ["json"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-serde_repr = "0.1.19"
 url = "2"

validation/api/src/context.rs

@@ -1,46 +0,0 @@
-pub struct Cookie(reqwest::header::HeaderValue);
-
-impl Cookie{
-	/// cookie is prepended with "session_id=" by this function
-	pub fn new(cookie:&str)->Result<Self,reqwest::header::InvalidHeaderValue>{
-		Ok(Self(reqwest::header::HeaderValue::from_str(&format!("session_id={}",cookie))?))
-	}
-}
-
-#[derive(Clone)]
-pub struct Context{
-	pub base_url:String,
-	client:reqwest::Client,
-}
-
-impl Context{
-	pub fn new(base_url:String,cookie:Option<Cookie>)->reqwest::Result<Self>{
-		Ok(Self{
-			base_url,
-			client:{
-				let mut builder=reqwest::ClientBuilder::new();
-				if let Some(mut cookie)=cookie{
-					cookie.0.set_sensitive(true);
-					let mut headers=reqwest::header::HeaderMap::new();
-					headers.insert("Cookie",cookie.0);
-					builder=builder.default_headers(headers);
-				}
-				builder.build()?
-			},
-		})
-	}
-	pub async fn get(&self,url:impl reqwest::IntoUrl)->Result<reqwest::Response,reqwest::Error>{
-		self.client.get(url)
-		.send().await
-	}
-	pub async fn post(&self,url:impl reqwest::IntoUrl,body:impl Into<reqwest::Body>)->Result<reqwest::Response,reqwest::Error>{
-		self.client.post(url)
-    	.header("Content-Type","application/json")
-    	.body(body)
-		.send().await
-	}
-	pub async fn delete(&self,url:impl reqwest::IntoUrl)->Result<reqwest::Response,reqwest::Error>{
-		self.client.delete(url)
-		.send().await
-	}
-}

validation/api/src/external.rs

@@ -1,233 +0,0 @@
-use crate::types::*;
-
-#[derive(Clone)]
-pub struct Context(crate::context::Context);
-
-impl Context{
-	pub fn new(base_url:String,cookie:crate::context::Cookie)->reqwest::Result<Self>{
-		Ok(Self(crate::context::Context::new(base_url,Some(cookie))?))
-	}
-	pub async fn get_script(&self,config:GetScriptRequest)->Result<ScriptResponse,Error>{
-		let url_raw=format!("{}/scripts/{}",self.0.base_url,config.ScriptID.0);
-		let url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::Parse)?;
-
-		response_ok(
-			self.0.get(url).await.map_err(Error::Reqwest)?
-		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
-	}
-	pub async fn get_scripts(&self,config:GetScriptsRequest<'_>)->Result<Vec<ScriptResponse>,Error>{
-		let url_raw=format!("{}/scripts",self.0.base_url);
-		let mut url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::Parse)?;
-
-		{
-			let mut query_pairs=url.query_pairs_mut();
-			query_pairs.append_pair("Page",config.Page.to_string().as_str());
-			query_pairs.append_pair("Limit",config.Limit.to_string().as_str());
-			if let Some(name)=config.Name{
-				query_pairs.append_pair("Name",name);
-			}
-			if let Some(hash)=config.Hash{
-				query_pairs.append_pair("Hash",hash);
-			}
-			if let Some(source)=config.Source{
-				query_pairs.append_pair("Source",source);
-			}
-			if let Some(resource_type)=config.ResourceType{
-				query_pairs.append_pair("ResourceType",(resource_type as i32).to_string().as_str());
-			}
-			if let Some(ResourceID(resource_id))=config.ResourceID{
-				query_pairs.append_pair("ResourceID",resource_id.to_string().as_str());
-			}
-		}
-
-		response_ok(
-			self.0.get(url).await.map_err(Error::Reqwest)?
-		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
-	}
-	pub async fn get_script_from_hash(&self,config:HashRequest<'_>)->Result<Option<ScriptResponse>,ScriptSingleItemError>{
-		let scripts=self.get_scripts(GetScriptsRequest{
-			Page:1,
-			Limit:2,
-			Hash:Some(config.hash),
-			Name:None,
-			Source:None,
-			ResourceType:None,
-			ResourceID:None,
-		}).await.map_err(SingleItemError::Other)?;
-		if 1<scripts.len(){
-			return Err(SingleItemError::DuplicateItems(scripts.into_iter().map(|item|item.ID).collect()));
-		}
-		Ok(scripts.into_iter().next())
-	}
-	pub async fn create_script(&self,config:CreateScriptRequest<'_>)->Result<ScriptIDResponse,Error>{
-		let url_raw=format!("{}/scripts",self.0.base_url);
-		let url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::Parse)?;
-
-		let body=serde_json::to_string(&config).map_err(Error::JSON)?;
-
-		response_ok(
-			self.0.post(url,body).await.map_err(Error::Reqwest)?
-		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
-	}
-	pub async fn delete_script(&self,config:GetScriptRequest)->Result<(),Error>{
-		let url_raw=format!("{}/scripts/{}",self.0.base_url,config.ScriptID.0);
-		let url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::Parse)?;
-
-		response_ok(
-			self.0.delete(url).await.map_err(Error::Reqwest)?
-		).await.map_err(Error::Response)?;
-
-		Ok(())
-	}
-	pub async fn get_script_policies(&self,config:GetScriptPoliciesRequest<'_>)->Result<Vec<ScriptPolicyResponse>,Error>{
-		let url_raw=format!("{}/script-policy",self.0.base_url);
-		let mut url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::Parse)?;
-
-		{
-			let mut query_pairs=url.query_pairs_mut();
-			query_pairs.append_pair("Page",config.Page.to_string().as_str());
-			query_pairs.append_pair("Limit",config.Limit.to_string().as_str());
-			if let Some(hash)=config.FromScriptHash{
-				query_pairs.append_pair("FromScriptHash",hash);
-			}
-			if let Some(script_id)=config.ToScriptID{
-				query_pairs.append_pair("ToScriptID",script_id.0.to_string().as_str());
-			}
-			if let Some(policy)=config.Policy{
-				query_pairs.append_pair("Policy",(policy as i32).to_string().as_str());
-			}
-		}
-
-		response_ok(
-			self.0.get(url).await.map_err(Error::Reqwest)?
-		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
-	}
-	pub async fn get_script_policy_from_hash(&self,config:HashRequest<'_>)->Result<Option<ScriptPolicyResponse>,ScriptPolicySingleItemError>{
-		let policies=self.get_script_policies(GetScriptPoliciesRequest{
-			Page:1,
-			Limit:2,
-			FromScriptHash:Some(config.hash),
-			ToScriptID:None,
-			Policy:None,
-		}).await.map_err(SingleItemError::Other)?;
-		if 1<policies.len(){
-			return Err(SingleItemError::DuplicateItems(policies.into_iter().map(|item|item.ID).collect()));
-		}
-		Ok(policies.into_iter().next())
-	}
-	pub async fn create_script_policy(&self,config:CreateScriptPolicyRequest)->Result<ScriptPolicyIDResponse,Error>{
-		let url_raw=format!("{}/script-policy",self.0.base_url);
-		let url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::Parse)?;
-
-		let body=serde_json::to_string(&config).map_err(Error::JSON)?;
-
-		response_ok(
-			self.0.post(url,body).await.map_err(Error::Reqwest)?
-		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
-	}
-	pub async fn update_script_policy(&self,config:UpdateScriptPolicyRequest)->Result<(),Error>{
-		let url_raw=format!("{}/script-policy/{}",self.0.base_url,config.ID.0);
-		let url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::Parse)?;
-
-		let body=serde_json::to_string(&config).map_err(Error::JSON)?;
-
-		response_ok(
-			self.0.post(url,body).await.map_err(Error::Reqwest)?
-		).await.map_err(Error::Response)?;
-
-		Ok(())
-	}
-	pub async fn delete_script_policy(&self,config:GetScriptPolicyRequest)->Result<(),Error>{
-		let url_raw=format!("{}/script-policy/{}",self.0.base_url,config.ScriptPolicyID.0);
-		let url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::Parse)?;
-
-		response_ok(
-			self.0.delete(url).await.map_err(Error::Reqwest)?
-		).await.map_err(Error::Response)?;
-
-		Ok(())
-	}
-	pub async fn get_submissions(&self,config:GetSubmissionsRequest<'_>)->Result<SubmissionsResponse,Error>{
-		let url_raw=format!("{}/submissions",self.0.base_url);
-		let mut url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::Parse)?;
-
-		{
-			let mut query_pairs=url.query_pairs_mut();
-			query_pairs.append_pair("Page",config.Page.to_string().as_str());
-			query_pairs.append_pair("Limit",config.Limit.to_string().as_str());
-			if let Some(sort)=config.Sort{
-				query_pairs.append_pair("Sort",(sort as u8).to_string().as_str());
-			}
-			if let Some(display_name)=config.DisplayName{
-				query_pairs.append_pair("DisplayName",display_name);
-			}
-			if let Some(creator)=config.Creator{
-				query_pairs.append_pair("Creator",creator);
-			}
-			if let Some(game_id)=config.GameID{
-				query_pairs.append_pair("GameID",(game_id as u8).to_string().as_str());
-			}
-			if let Some(submitter)=config.Submitter{
-				query_pairs.append_pair("Submitter",submitter.to_string().as_str());
-			}
-			if let Some(asset_id)=config.AssetID{
-				query_pairs.append_pair("AssetID",asset_id.to_string().as_str());
-			}
-			if let Some(uploaded_asset_id)=config.UploadedAssetID{
-				query_pairs.append_pair("UploadedAssetID",uploaded_asset_id.to_string().as_str());
-			}
-			if let Some(status_id)=config.StatusID{
-				query_pairs.append_pair("StatusID",(status_id as u8).to_string().as_str());
-			}
-		}
-
-		response_ok(
-			self.0.get(url).await.map_err(Error::Reqwest)?
-		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
-	}
-	pub async fn get_maps(&self,config:GetMapsRequest<'_>)->Result<Vec<MapResponse>,Error>{
-		let url_raw=format!("{}/maps",self.0.base_url);
-		let mut url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::Parse)?;
-
-		{
-			let mut query_pairs=url.query_pairs_mut();
-			query_pairs.append_pair("Page",config.Page.to_string().as_str());
-			query_pairs.append_pair("Limit",config.Limit.to_string().as_str());
-			if let Some(sort)=config.Sort{
-				query_pairs.append_pair("Sort",(sort as u8).to_string().as_str());
-			}
-			if let Some(display_name)=config.DisplayName{
-				query_pairs.append_pair("DisplayName",display_name);
-			}
-			if let Some(creator)=config.Creator{
-				query_pairs.append_pair("Creator",creator);
-			}
-			if let Some(game_id)=config.GameID{
-				query_pairs.append_pair("GameID",(game_id as u8).to_string().as_str());
-			}
-		}
-
-		response_ok(
-			self.0.get(url).await.map_err(Error::Reqwest)?
-		).await.map_err(Error::Response)?
-		.json().await.map_err(Error::ReqwestJson)
-	}
-	pub async fn release_submissions(&self,config:ReleaseRequest<'_>)->Result<(),Error>{
-		let url_raw=format!("{}/release-submissions",self.0.base_url);
-		let url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::Parse)?;
-
-		let body=serde_json::to_string(config.schedule).map_err(Error::JSON)?;
-
-		response_ok(
-			self.0.post(url,body).await.map_err(Error::Reqwest)?
-		).await.map_err(Error::Response)?;
-
-		Ok(())
-	}
-}

validation/api/src/lib.rs

@@ -1,10 +1,130 @@
-mod context;
+#[derive(Debug)]
-pub use context::Cookie;
+pub enum Error{
+	ParseError(url::ParseError),
+	Reqwest(reqwest::Error),
+}
+impl std::fmt::Display for Error{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for Error{}
 
-pub mod types;
+#[derive(serde::Deserialize)]
-pub mod external;
+pub struct ScriptID(i64);
+
+#[allow(nonstandard_style)]
+pub struct GetScriptRequest{
+	pub ScriptID:ScriptID,
+}
+#[allow(nonstandard_style)]
+#[derive(serde::Deserialize)]
+pub struct ScriptResponse{
+	pub ID:i64,
+	pub Hash:String,
+	pub Source:String,
+	pub SubmissionID:i64,
+}
+
+#[derive(serde::Deserialize)]
+#[repr(i32)]
+pub enum Policy{
+	Allowed=0,
+	Blocked=1,
+	Delete=2,
+	Replace=3,
+}
+
+pub struct ScriptPolicyHashRequest{
+	pub hash:String,
+}
+#[allow(nonstandard_style)]
+#[derive(serde::Deserialize)]
+pub struct ScriptPolicyResponse{
+	pub ID:i64,
+	pub FromScriptHash:String,
+	pub ToScriptID:ScriptID,
+	pub Policy:Policy
+}
+
+#[allow(nonstandard_style)]
+pub struct UpdateSubmissionModelRequest{
+	pub ID:i64,
+	pub ModelID:u64,
+	pub ModelVersion:u64,
+}
+
+pub struct SubmissionID(pub i64);
+
+#[derive(Clone)]
+pub struct Context{
+	base_url:String,
+	client:reqwest::Client,
+}
 
-//lazy reexports
-pub use types::Error;
 pub type ReqwestError=reqwest::Error;
-pub type CookieError=reqwest::header::InvalidHeaderValue;
+
+// there are lots of action endpoints and they all follow the same pattern
+macro_rules! action{
+	($fname:ident,$action:expr)=>{
+		pub async fn $fname(&self,config:SubmissionID)->Result<(),Error>{
+			let url_raw=format!(concat!("{}/submissions/{}/status/",$action),self.base_url,config.0);
+			let url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::ParseError)?;
+
+			self.post(url).await.map_err(Error::Reqwest)?
+			.error_for_status().map_err(Error::Reqwest)?;
+
+			Ok(())
+		}
+	};
+}
+impl Context{
+	pub fn new(mut base_url:String)->reqwest::Result<Self>{
+		base_url+="/v1";
+		Ok(Self{
+			base_url,
+			client:reqwest::Client::new(),
+		})
+	}
+	async fn get(&self,url:impl reqwest::IntoUrl)->Result<reqwest::Response,reqwest::Error>{
+		self.client.get(url)
+		.send().await
+	}
+	async fn post(&self,url:impl reqwest::IntoUrl)->Result<reqwest::Response,reqwest::Error>{
+		self.client.post(url)
+		.send().await
+	}
+	pub async fn get_script(&self,config:GetScriptRequest)->Result<ScriptResponse,Error>{
+		let url_raw=format!("{}/scripts/{}",self.base_url,config.ScriptID.0);
+		let url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::ParseError)?;
+
+		self.get(url).await.map_err(Error::Reqwest)?
+		.error_for_status().map_err(Error::Reqwest)?
+		.json().await.map_err(Error::Reqwest)
+	}
+	pub async fn get_script_policy_from_hash(&self,config:ScriptPolicyHashRequest)->Result<ScriptPolicyResponse,Error>{
+		let url_raw=format!("{}/script-policy/hash/{}",self.base_url,config.hash);
+		let url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::ParseError)?;
+
+		self.get(url).await.map_err(Error::Reqwest)?
+		.error_for_status().map_err(Error::Reqwest)?
+		.json().await.map_err(Error::Reqwest)
+	}
+	pub async fn update_submission_model(&self,config:UpdateSubmissionModelRequest)->Result<(),Error>{
+		let url_raw=format!("{}/submissions/{}/model",self.base_url,config.ID);
+		let mut url=reqwest::Url::parse(url_raw.as_str()).map_err(Error::ParseError)?;
+
+		{
+			url.query_pairs_mut()
+				.append_pair("ModelID",config.ModelID.to_string().as_str())
+				.append_pair("ModelVersion",config.ModelVersion.to_string().as_str());
+		}
+
+		self.post(url).await.map_err(Error::Reqwest)?
+		.error_for_status().map_err(Error::Reqwest)?;
+
+		Ok(())
+	}
+	action!(action_submission_validate,"validator-validated");
+	action!(action_submission_publish,"validator-published");
+}

validation/api/src/types.rs

@@ -1,480 +0,0 @@
-#[derive(Debug)]
-pub enum Error{
-	Parse(url::ParseError),
-	Reqwest(reqwest::Error),
-	ReqwestJson(reqwest::Error),
-	Response(ResponseError),
-	JSON(serde_json::Error),
-}
-impl std::fmt::Display for Error{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for Error{}
-
-#[derive(Debug)]
-pub enum SingleItemError<Items>{
-	DuplicateItems(Items),
-	Other(Error),
-}
-impl<Items> std::fmt::Display for SingleItemError<Items>
-where
-	Items:std::fmt::Debug
-{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl<Items> std::error::Error for SingleItemError<Items> where Items:std::fmt::Debug{}
-pub type ScriptSingleItemError=SingleItemError<Vec<ScriptID>>;
-pub type ScriptPolicySingleItemError=SingleItemError<Vec<ScriptPolicyID>>;
-
-#[allow(dead_code)]
-#[derive(Debug)]
-pub struct UrlAndBody{
-	pub url:url::Url,
-	pub body:String,
-}
-
-#[derive(Debug)]
-pub enum ResponseError{
-	Reqwest(reqwest::Error),
-	Details{
-		status_code:reqwest::StatusCode,
-		url_and_body:Box<UrlAndBody>,
-	},
-}
-impl std::fmt::Display for ResponseError{
-	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for ResponseError{}
-// lazy function to draw out meaningful info from http response on failure
-pub async fn response_ok(response:reqwest::Response)->Result<reqwest::Response,ResponseError>{
-	let status_code=response.status();
-	if status_code.is_success(){
-		Ok(response)
-	}else{
-		let url=response.url().to_owned();
-		let bytes=response.bytes().await.map_err(ResponseError::Reqwest)?;
-		let body=String::from_utf8_lossy(&bytes).to_string();
-		Err(ResponseError::Details{
-			status_code,
-			url_and_body:Box::new(UrlAndBody{url,body})
-		})
-	}
-}
-
-#[derive(Clone,Copy,Debug,Hash,Eq,PartialEq,Ord,PartialOrd,serde_repr::Serialize_repr,serde_repr::Deserialize_repr)]
-#[repr(u8)]
-pub enum GameID{
-	Bhop=1,
-	Surf=2,
-	KreedzClimb=3,
-	FlyTrials=5,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Serialize)]
-pub struct CreateMapfixRequest<'a>{
-	pub OperationID:OperationID,
-	pub AssetOwner:i64,
-	pub DisplayName:&'a str,
-	pub Creator:&'a str,
-	pub GameID:GameID,
-	pub AssetID:u64,
-	pub AssetVersion:u64,
-	pub TargetAssetID:u64,
-	pub Description:&'a str,
-}
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Deserialize)]
-pub struct MapfixIDResponse{
-	pub MapfixID:MapfixID,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Serialize)]
-pub struct CreateSubmissionRequest<'a>{
-	pub OperationID:OperationID,
-	pub AssetOwner:i64,
-	pub DisplayName:&'a str,
-	pub Creator:&'a str,
-	pub GameID:GameID,
-	pub AssetID:u64,
-	pub AssetVersion:u64,
-	pub Status:u32,
-	pub Roles:u32,
-}
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Deserialize)]
-pub struct SubmissionIDResponse{
-	pub SubmissionID:SubmissionID,
-}
-
-#[derive(Clone,Copy,Debug,Hash,Eq,PartialEq,serde::Serialize,serde::Deserialize)]
-pub struct ScriptID(pub(crate)i64);
-#[derive(Clone,Copy,Debug,Hash,Eq,PartialEq,serde::Serialize,serde::Deserialize)]
-pub struct ScriptPolicyID(pub(crate)i64);
-
-#[derive(Clone,Copy,Debug,PartialEq,Eq,serde_repr::Serialize_repr,serde_repr::Deserialize_repr)]
-#[repr(i32)]
-pub enum ResourceType{
-	Unknown=0,
-	Mapfix=1,
-	Submission=2,
-}
-
-#[allow(nonstandard_style)]
-pub struct GetScriptRequest{
-	pub ScriptID:ScriptID,
-}
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Serialize)]
-pub struct GetScriptsRequest<'a>{
-	pub Page:u32,
-	pub Limit:u32,
-	#[serde(skip_serializing_if="Option::is_none")]
-	pub Name:Option<&'a str>,
-	#[serde(skip_serializing_if="Option::is_none")]
-	pub Hash:Option<&'a str>,
-	#[serde(skip_serializing_if="Option::is_none")]
-	pub Source:Option<&'a str>,
-	#[serde(skip_serializing_if="Option::is_none")]
-	pub ResourceType:Option<ResourceType>,
-	#[serde(skip_serializing_if="Option::is_none")]
-	pub ResourceID:Option<ResourceID>,
-}
-#[derive(Clone,Copy,Debug)]
-pub struct HashRequest<'a>{
-	pub hash:&'a str,
-}
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Deserialize)]
-pub struct ScriptResponse{
-	pub ID:ScriptID,
-	pub Name:String,
-	pub Hash:String,
-	pub Source:String,
-	pub ResourceType:ResourceType,
-	pub ResourceID:ResourceID,
-}
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Serialize)]
-pub struct CreateScriptRequest<'a>{
-	pub Name:&'a str,
-	pub Source:&'a str,
-	pub ResourceType:ResourceType,
-	#[serde(skip_serializing_if="Option::is_none")]
-	pub ResourceID:Option<ResourceID>,
-}
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Deserialize)]
-pub struct ScriptIDResponse{
-	pub ScriptID:ScriptID,
-}
-
-#[derive(Clone,Copy,Debug,PartialEq,Eq,serde_repr::Serialize_repr,serde_repr::Deserialize_repr)]
-#[repr(i32)]
-pub enum Policy{
-	None=0, // not yet reviewed
-	Allowed=1,
-	Blocked=2,
-	Delete=3,
-	Replace=4,
-}
-
-#[allow(nonstandard_style)]
-pub struct GetScriptPolicyRequest{
-	pub ScriptPolicyID:ScriptPolicyID,
-}
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Serialize)]
-pub struct GetScriptPoliciesRequest<'a>{
-	pub Page:u32,
-	pub Limit:u32,
-	#[serde(skip_serializing_if="Option::is_none")]
-	pub FromScriptHash:Option<&'a str>,
-	#[serde(skip_serializing_if="Option::is_none")]
-	pub ToScriptID:Option<ScriptID>,
-	#[serde(skip_serializing_if="Option::is_none")]
-	pub Policy:Option<Policy>,
-}
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Deserialize)]
-pub struct ScriptPolicyResponse{
-	pub ID:ScriptPolicyID,
-	pub FromScriptHash:String,
-	pub ToScriptID:ScriptID,
-	pub Policy:Policy
-}
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Serialize)]
-pub struct CreateScriptPolicyRequest{
-	pub FromScriptID:ScriptID,
-	pub ToScriptID:ScriptID,
-	pub Policy:Policy,
-}
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Deserialize)]
-pub struct ScriptPolicyIDResponse{
-	pub ScriptPolicyID:ScriptPolicyID,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Serialize)]
-pub struct UpdateScriptPolicyRequest{
-	pub ID:ScriptPolicyID,
-	#[serde(skip_serializing_if="Option::is_none")]
-	pub FromScriptID:Option<ScriptID>,
-	#[serde(skip_serializing_if="Option::is_none")]
-	pub ToScriptID:Option<ScriptID>,
-	#[serde(skip_serializing_if="Option::is_none")]
-	pub Policy:Option<Policy>,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct UpdateSubmissionModelRequest{
-	pub SubmissionID:SubmissionID,
-	pub ModelID:u64,
-	pub ModelVersion:u64,
-}
-
-#[derive(Clone,Debug)]
-pub enum Sort{
-	Disabled=0,
-	DisplayNameAscending=1,
-	DisplayNameDescending=2,
-	DateAscending=3,
-	DateDescending=4,
-}
-
-#[derive(Clone,Debug,serde_repr::Deserialize_repr)]
-#[repr(u8)]
-pub enum SubmissionStatus{
-	// Phase: Creation
-	UnderConstruction=0,
-	ChangesRequested=1,
-
-	// Phase: Review
-	Submitting=2,
-	Submitted=3,
-
-	// Phase: Testing
-	AcceptedUnvalidated=4, // pending script review, can re-trigger validation
-	Validating=5,
-	Validated=6,
-	Uploading=7,
-	Uploaded=8, // uploaded to the group, but pending release
-
-	// Phase: Final SubmissionStatus
-	Rejected=9,
-	Released=10,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct GetSubmissionsRequest<'a>{
-	pub Page:u32,
-	pub Limit:u32,
-	pub Sort:Option<Sort>,
-	pub DisplayName:Option<&'a str>,
-	pub Creator:Option<&'a str>,
-	pub GameID:Option<GameID>,
-	pub Submitter:Option<u64>,
-	pub AssetID:Option<u64>,
-	pub UploadedAssetID:Option<u64>,
-	pub StatusID:Option<SubmissionStatus>,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Deserialize)]
-pub struct SubmissionResponse{
-	pub ID:SubmissionID,
-	pub DisplayName:String,
-	pub Creator:String,
-	pub GameID:GameID,
-	pub CreatedAt:i64,
-	pub UpdatedAt:i64,
-	pub Submitter:u64,
-	pub AssetID:u64,
-	pub AssetVersion:u64,
-	pub UploadedAssetID:u64,
-	pub StatusID:SubmissionStatus,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Deserialize)]
-pub struct SubmissionsResponse{
-	pub Total:u64,
-	pub Submissions:Vec<SubmissionResponse>,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct GetMapsRequest<'a>{
-	pub Page:u32,
-	pub Limit:u32,
-	pub Sort:Option<Sort>,
-	pub DisplayName:Option<&'a str>,
-	pub Creator:Option<&'a str>,
-	pub GameID:Option<GameID>,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Deserialize)]
-pub struct MapResponse{
-	pub ID:i64,
-	pub DisplayName:String,
-	pub Creator:String,
-	pub GameID:GameID,
-	pub Date:i64,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Serialize)]
-pub struct Check{
-	pub Name:&'static str,
-	pub Summary:String,
-	pub Passed:bool,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct ActionSubmissionSubmittedRequest{
-	pub SubmissionID:SubmissionID,
-	pub ModelVersion:u64,
-	pub DisplayName:String,
-	pub Creator:String,
-	pub GameID:GameID,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct ActionSubmissionRequestChangesRequest{
-	pub SubmissionID:SubmissionID,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct ActionSubmissionUploadedRequest{
-	pub SubmissionID:SubmissionID,
-	pub UploadedAssetID:u64,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct ActionSubmissionAcceptedRequest{
-	pub SubmissionID:SubmissionID,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct CreateSubmissionAuditErrorRequest{
-	pub SubmissionID:SubmissionID,
-	pub ErrorMessage:String,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct CreateSubmissionAuditCheckListRequest<'a>{
-	pub SubmissionID:SubmissionID,
-	pub CheckList:&'a [Check],
-}
-
-#[derive(Clone,Copy,Debug,Hash,Eq,PartialEq,serde::Serialize,serde::Deserialize)]
-pub struct SubmissionID(pub(crate)i64);
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct UpdateMapfixModelRequest{
-	pub MapfixID:MapfixID,
-	pub ModelID:u64,
-	pub ModelVersion:u64,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct ActionMapfixSubmittedRequest{
-	pub MapfixID:MapfixID,
-	pub ModelVersion:u64,
-	pub DisplayName:String,
-	pub Creator:String,
-	pub GameID:GameID,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct ActionMapfixRequestChangesRequest{
-	pub MapfixID:MapfixID,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct ActionMapfixUploadedRequest{
-	pub MapfixID:MapfixID,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct ActionMapfixAcceptedRequest{
-	pub MapfixID:MapfixID,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct CreateMapfixAuditErrorRequest{
-	pub MapfixID:MapfixID,
-	pub ErrorMessage:String,
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct CreateMapfixAuditCheckListRequest<'a>{
-	pub MapfixID:MapfixID,
-	pub CheckList:&'a [Check],
-}
-
-#[derive(Clone,Copy,Debug,Hash,Eq,PartialEq,serde::Serialize,serde::Deserialize)]
-pub struct MapfixID(pub(crate)i64);
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug)]
-pub struct ActionOperationFailedRequest{
-	pub OperationID:OperationID,
-	pub StatusMessage:String,
-}
-
-#[derive(Clone,Copy,Debug,Hash,Eq,PartialEq,serde::Serialize,serde::Deserialize)]
-pub struct OperationID(pub(crate)i64);
-
-#[derive(Clone,Copy,Debug,Hash,Eq,PartialEq,serde::Serialize,serde::Deserialize)]
-pub struct ResourceID(pub(crate)i64);
-
-#[derive(Clone,Copy,Debug)]
-pub enum Resource{
-	Submission(SubmissionID),
-	Mapfix(MapfixID),
-}
-impl Resource{
-	pub fn split(self)->(ResourceType,ResourceID){
-		match self{
-			Resource::Mapfix(MapfixID(mapfix_id))=>(ResourceType::Mapfix,ResourceID(mapfix_id)),
-			Resource::Submission(SubmissionID(submission_id))=>(ResourceType::Submission,ResourceID(submission_id)),
-		}
-	}
-}
-
-#[allow(nonstandard_style)]
-#[derive(Clone,Debug,serde::Serialize)]
-pub struct ReleaseInfo{
-	pub SubmissionID:SubmissionID,
-	pub Date:chrono::DateTime<chrono::Utc>,
-}
-
-pub struct ReleaseRequest<'a>{
-	pub schedule:&'a [ReleaseInfo],
-}

validation/src/check.rs

@@ -1,900 +0,0 @@
-use std::collections::{HashSet,HashMap};
-use crate::download::download_asset_version;
-use crate::rbx_util::{get_mapinfo,get_root_instance,read_dom,ReadDomError,GameID,ParseGameIDError,MapInfo,GetRootInstanceError,StringValueError};
-
-use heck::{ToSnakeCase,ToTitleCase};
-use rbx_dom_weak::Instance;
-use rust_grpc::validator::Check;
-
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum Error{
-	ModelInfoDownload(rbx_asset::cloud::GetError),
-	CreatorTypeMustBeUser,
-	Download(crate::download::Error),
-	ModelFileDecode(ReadDomError),
-	GetRootInstance(GetRootInstanceError),
-	IntoMapInfoOwned(IntoMapInfoOwnedError),
-	ToJsonValue(serde_json::Error),
-}
-impl std::fmt::Display for Error{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for Error{}
-
-#[allow(nonstandard_style)]
-pub struct CheckRequest{
-	ModelID:u64,
-	SkipChecks:bool,
-}
-
-impl From<crate::nats_types::CheckMapfixRequest> for CheckRequest{
-	fn from(value:crate::nats_types::CheckMapfixRequest)->Self{
-		Self{
-			ModelID:value.ModelID,
-			SkipChecks:value.SkipChecks,
-		}
-	}
-}
-impl From<crate::nats_types::CheckSubmissionRequest> for CheckRequest{
-	fn from(value:crate::nats_types::CheckSubmissionRequest)->Self{
-		Self{
-			ModelID:value.ModelID,
-			SkipChecks:value.SkipChecks,
-		}
-	}
-}
-
-#[derive(Clone,Copy,Debug,Hash,Eq,PartialEq)]
-struct ModeID(u64);
-impl ModeID{
-	const MAIN:Self=Self(0);
-	const BONUS:Self=Self(1);
-}
-enum Zone{
-	Start,
-	Finish,
-	Anticheat,
-}
-struct ModeElement{
-	zone:Zone,
-	mode_id:ModeID,
-}
-#[allow(dead_code)]
-pub enum IDParseError{
-	NoCaptures,
-	ParseInt(core::num::ParseIntError),
-}
-// Parse a Zone from a part name
-impl std::str::FromStr for ModeElement{
-	type Err=IDParseError;
-	fn from_str(s:&str)->Result<Self,Self::Err>{
-		match s{
-			"MapStart"=>Ok(Self{zone:Zone::Start,mode_id:ModeID::MAIN}),
-			"MapFinish"=>Ok(Self{zone:Zone::Finish,mode_id:ModeID::MAIN}),
-			"MapAnticheat"=>Ok(Self{zone:Zone::Anticheat,mode_id:ModeID::MAIN}),
-			"BonusStart"=>Ok(Self{zone:Zone::Start,mode_id:ModeID::BONUS}),
-			"BonusFinish"=>Ok(Self{zone:Zone::Finish,mode_id:ModeID::BONUS}),
-			"BonusAnticheat"=>Ok(Self{zone:Zone::Anticheat,mode_id:ModeID::BONUS}),
-			other=>{
-				let everything_pattern=lazy_regex::lazy_regex!(r"^Bonus(\d+)Start$|^BonusStart(\d+)$|^Bonus(\d+)Finish$|^BonusFinish(\d+)$|^Bonus(\d+)Anticheat$|^BonusAnticheat(\d+)$");
-				if let Some(captures)=everything_pattern.captures(other){
-					if let Some(mode_id)=captures.get(1).or(captures.get(2)){
-						return Ok(Self{
-							zone:Zone::Start,
-							mode_id:ModeID(mode_id.as_str().parse().map_err(IDParseError::ParseInt)?),
-						});
-					}
-					if let Some(mode_id)=captures.get(3).or(captures.get(4)){
-						return Ok(Self{
-							zone:Zone::Finish,
-							mode_id:ModeID(mode_id.as_str().parse().map_err(IDParseError::ParseInt)?),
-						});
-					}
-					if let Some(mode_id)=captures.get(5).or(captures.get(6)){
-						return Ok(Self{
-							zone:Zone::Anticheat,
-							mode_id:ModeID(mode_id.as_str().parse().map_err(IDParseError::ParseInt)?),
-						});
-					}
-				}
-				Err(IDParseError::NoCaptures)
-			}
-		}
-	}
-}
-impl std::fmt::Display for ModeElement{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		match self{
-			ModeElement{zone:Zone::Start,mode_id:ModeID::MAIN}=>write!(f,"MapStart"),
-			ModeElement{zone:Zone::Start,mode_id:ModeID::BONUS}=>write!(f,"BonusStart"),
-			ModeElement{zone:Zone::Start,mode_id:ModeID(mode_id)}=>write!(f,"Bonus{mode_id}Start"),
-			ModeElement{zone:Zone::Finish,mode_id:ModeID::MAIN}=>write!(f,"MapFinish"),
-			ModeElement{zone:Zone::Finish,mode_id:ModeID::BONUS}=>write!(f,"BonusFinish"),
-			ModeElement{zone:Zone::Finish,mode_id:ModeID(mode_id)}=>write!(f,"Bonus{mode_id}Finish"),
-			ModeElement{zone:Zone::Anticheat,mode_id:ModeID::MAIN}=>write!(f,"MapAnticheat"),
-			ModeElement{zone:Zone::Anticheat,mode_id:ModeID::BONUS}=>write!(f,"BonusAnticheat"),
-			ModeElement{zone:Zone::Anticheat,mode_id:ModeID(mode_id)}=>write!(f,"Bonus{mode_id}Anticheat"),
-		}
-	}
-}
-
-#[derive(Clone,Copy,Debug,Hash,Eq,PartialEq)]
-struct StageID(u64);
-impl StageID{
-	const FIRST:Self=Self(1);
-}
-enum StageElementBehaviour{
-	Teleport,
-	Spawn,
-}
-struct StageElement{
-	stage_id:StageID,
-	behaviour:StageElementBehaviour,
-}
-// Parse a SpawnTeleport from a part name
-impl std::str::FromStr for StageElement{
-	type Err=IDParseError;
-	fn from_str(s:&str)->Result<Self,Self::Err>{
-		// Trigger ForceTrigger Teleport ForceTeleport SpawnAt ForceSpawnAt
-		let bonus_start_pattern=lazy_regex::lazy_regex!(r"^(?:Force)?(Teleport|SpawnAt|Trigger)(\d+)$");
-		if let Some(captures)=bonus_start_pattern.captures(s){
-			return Ok(StageElement{
-				behaviour:StageElementBehaviour::Teleport,
-				stage_id:StageID(captures[1].parse().map_err(IDParseError::ParseInt)?),
-			});
-		}
-		// Spawn
-		let bonus_finish_pattern=lazy_regex::lazy_regex!(r"^Spawn(\d+)$");
-		if let Some(captures)=bonus_finish_pattern.captures(s){
-			return Ok(StageElement{
-				behaviour:StageElementBehaviour::Spawn,
-				stage_id:StageID(captures[1].parse().map_err(IDParseError::ParseInt)?),
-			});
-		}
-		Err(IDParseError::NoCaptures)
-	}
-}
-impl std::fmt::Display for StageElement{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		match self{
-			StageElement{behaviour:StageElementBehaviour::Spawn,stage_id:StageID(stage_id)}=>write!(f,"Spawn{stage_id}"),
-			StageElement{behaviour:StageElementBehaviour::Teleport,stage_id:StageID(stage_id)}=>write!(f,"Teleport{stage_id}"),
-		}
-	}
-}
-
-#[derive(Clone,Copy,Debug,Hash,Eq,PartialEq)]
-struct WormholeID(u64);
-enum WormholeBehaviour{
-	In,
-	Out,
-}
-struct WormholeElement{
-	behaviour:WormholeBehaviour,
-	wormhole_id:WormholeID,
-}
-// Parse a Wormhole from a part name
-impl std::str::FromStr for WormholeElement{
-	type Err=IDParseError;
-	fn from_str(s:&str)->Result<Self,Self::Err>{
-		let bonus_start_pattern=lazy_regex::lazy_regex!(r"^WormholeIn(\d+)$");
-		if let Some(captures)=bonus_start_pattern.captures(s){
-			return Ok(Self{
-				behaviour:WormholeBehaviour::In,
-				wormhole_id:WormholeID(captures[1].parse().map_err(IDParseError::ParseInt)?),
-			});
-		}
-		let bonus_finish_pattern=lazy_regex::lazy_regex!(r"^WormholeOut(\d+)$");
-		if let Some(captures)=bonus_finish_pattern.captures(s){
-			return Ok(Self{
-				behaviour:WormholeBehaviour::Out,
-				wormhole_id:WormholeID(captures[1].parse().map_err(IDParseError::ParseInt)?),
-			});
-		}
-		Err(IDParseError::NoCaptures)
-	}
-}
-impl std::fmt::Display for WormholeElement{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		match self{
-			WormholeElement{behaviour:WormholeBehaviour::In,wormhole_id:WormholeID(wormhole_id)}=>write!(f,"WormholeIn{wormhole_id}"),
-			WormholeElement{behaviour:WormholeBehaviour::Out,wormhole_id:WormholeID(wormhole_id)}=>write!(f,"WormholeOut{wormhole_id}"),
-		}
-	}
-}
-
-/// Count various map elements
-#[derive(Default)]
-struct Counts<'a>{
-	mode_start_counts:HashMap<ModeID,Vec<&'a Instance>>,
-	mode_finish_counts:HashMap<ModeID,Vec<&'a Instance>>,
-	mode_anticheat_counts:HashMap<ModeID,Vec<&'a Instance>>,
-	teleport_counts:HashMap<StageID,Vec<&'a Instance>>,
-	spawn_counts:HashMap<StageID,u64>,
-	wormhole_in_counts:HashMap<WormholeID,u64>,
-	wormhole_out_counts:HashMap<WormholeID,u64>,
-}
-
-pub struct ModelInfo<'a>{
-	model_class:&'a str,
-	model_name:&'a str,
-	map_info:MapInfo<'a>,
-	counts:Counts<'a>,
-	unanchored_parts:Vec<&'a Instance>,
-}
-
-pub fn get_model_info<'a>(dom:&'a rbx_dom_weak::WeakDom,model_instance:&'a rbx_dom_weak::Instance)->ModelInfo<'a>{
-	// extract model info
-	let map_info=get_mapinfo(dom,model_instance);
-
-	// count objects (default count is 0)
-	let mut counts=Counts::default();
-
-	// locate unanchored parts
-	let mut unanchored_parts=Vec::new();
-	let anchored_ustr=rbx_dom_weak::ustr("Anchored");
-
-	let db=rbx_reflection_database::get();
-	let base_part=&db.classes["BasePart"];
-	let base_parts=dom.descendants_of(model_instance.referent()).filter(|&instance|
-		db.classes.get(instance.class.as_str()).is_some_and(|class|
-			db.has_superclass(class,base_part)
-		)
-	);
-	for instance in base_parts{
-		// Zones
-		match instance.name.parse(){
-			Ok(ModeElement{zone:Zone::Start,mode_id})=>counts.mode_start_counts.entry(mode_id).or_default().push(instance),
-			Ok(ModeElement{zone:Zone::Finish,mode_id})=>counts.mode_finish_counts.entry(mode_id).or_default().push(instance),
-			Ok(ModeElement{zone:Zone::Anticheat,mode_id})=>counts.mode_anticheat_counts.entry(mode_id).or_default().push(instance),
-			Err(_)=>(),
-		}
-		// Spawns & Teleports
-		match instance.name.parse(){
-			Ok(StageElement{behaviour:StageElementBehaviour::Teleport,stage_id})=>counts.teleport_counts.entry(stage_id).or_default().push(instance),
-			Ok(StageElement{behaviour:StageElementBehaviour::Spawn,stage_id})=>*counts.spawn_counts.entry(stage_id).or_insert(0)+=1,
-			Err(_)=>(),
-		}
-		// Wormholes
-		match instance.name.parse(){
-			Ok(WormholeElement{behaviour:WormholeBehaviour::In,wormhole_id})=>*counts.wormhole_in_counts.entry(wormhole_id).or_insert(0)+=1,
-			Ok(WormholeElement{behaviour:WormholeBehaviour::Out,wormhole_id})=>*counts.wormhole_out_counts.entry(wormhole_id).or_insert(0)+=1,
-			Err(_)=>(),
-		}
-		// Unanchored parts
-		if let Some(rbx_dom_weak::types::Variant::Bool(false))=instance.properties.get(&anchored_ustr){
-			unanchored_parts.push(instance);
-		}
-	}
-
-	ModelInfo{
-		model_class:model_instance.class.as_str(),
-		model_name:model_instance.name.as_str(),
-		map_info,
-		counts,
-		unanchored_parts,
-	}
-}
-
-// check if an observed string matches an expected string
-pub struct StringCheck<'a,T,Str>(Result<T,StringCheckContext<'a,Str>>);
-pub struct StringCheckContext<'a,Str>{
-	observed:&'a str,
-	expected:Str,
-}
-impl<'a,Str> StringCheckContext<'a,Str>
-	where
-		&'a str:PartialEq<Str>,
-{
-	/// Compute the StringCheck, passing through the provided value on success.
-	fn check<T>(self,value:T)->StringCheck<'a,T,Str>{
-		if self.observed==self.expected{
-			StringCheck(Ok(value))
-		}else{
-			StringCheck(Err(self))
-		}
-	}
-}
-impl<Str:std::fmt::Display> std::fmt::Display for StringCheckContext<'_,Str>{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"expected: {}, observed: {}",self.expected,self.observed)
-	}
-}
-
-// check if a string is empty
-pub struct StringEmpty;
-impl std::fmt::Display for StringEmpty{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"Empty string")
-	}
-}
-fn check_empty(value:&str)->Result<&str,StringEmpty>{
-	(!value.is_empty()).then_some(value).ok_or(StringEmpty)
-}
-
-// check for duplicate objects
-pub struct DuplicateCheckContext<ID,T>(HashMap<ID,T>);
-pub struct DuplicateCheck<ID,T>(Result<(),DuplicateCheckContext<ID,T>>);
-impl<ID,T> DuplicateCheckContext<ID,T>{
-	/// Compute the DuplicateCheck using the contents predicate.
-	fn check(self,f:impl Fn(&T)->bool)->DuplicateCheck<ID,T>{
-		let Self(mut set)=self;
-		// remove correct entries
-		set.retain(|_,c|f(c));
-		// if any entries remain, they are incorrect
-		if set.is_empty(){
-			DuplicateCheck(Ok(()))
-		}else{
-			DuplicateCheck(Err(Self(set)))
-		}
-	}
-}
-
-// Check that there are no items which do not have a matching item in a reference set
-pub struct SetDifferenceCheckContextAllowNone<ID,T>{
-	extra:HashMap<ID,T>,
-}
-// Check that there is at least one matching item for each item in a reference set, and no extra items
-pub struct SetDifferenceCheckContextAtLeastOne<ID,T>{
-	extra:HashMap<ID,T>,
-	missing:HashSet<ID>,
-}
-pub struct SetDifferenceCheck<Context>(Result<(),Context>);
-impl<ID,T> SetDifferenceCheckContextAllowNone<ID,T>{
-	fn new(initial_set:HashMap<ID,T>)->Self{
-		Self{
-			extra:initial_set,
-		}
-	}
-}
-impl<ID:Eq+std::hash::Hash,T> SetDifferenceCheckContextAllowNone<ID,T>{
-	/// Compute the SetDifferenceCheck result for the specified reference set.
-	fn check<U>(mut self,reference_set:&HashMap<ID,U>)->SetDifferenceCheck<Self>{
-		// remove correct entries
-		for id in reference_set.keys(){
-			self.extra.remove(id);
-		}
-		// if any entries remain, they are incorrect
-		if self.extra.is_empty(){
-			SetDifferenceCheck(Ok(()))
-		}else{
-			SetDifferenceCheck(Err(self))
-		}
-	}
-}
-impl<ID,T> SetDifferenceCheckContextAtLeastOne<ID,T>{
-	fn new(initial_set:HashMap<ID,T>)->Self{
-		Self{
-			extra:initial_set,
-			missing:HashSet::new(),
-		}
-	}
-}
-impl<ID:Copy+Eq+std::hash::Hash,T> SetDifferenceCheckContextAtLeastOne<ID,T>{
-	/// Compute the SetDifferenceCheck result for the specified reference set.
-	fn check<U>(mut self,reference_set:&HashMap<ID,U>)->SetDifferenceCheck<Self>{
-		// remove correct entries
-		for id in reference_set.keys(){
-			if self.extra.remove(id).is_none(){
-				// the set did not contain a required item.  This is a fail
-				self.missing.insert(*id);
-			}
-		}
-		// if any entries remain, they are incorrect
-		if self.extra.is_empty()&&self.missing.is_empty(){
-			SetDifferenceCheck(Ok(()))
-		}else{
-			SetDifferenceCheck(Err(self))
-		}
-	}
-}
-
-/// Info lifted out of a fully compliant map
-pub struct MapInfoOwned{
-	pub display_name:String,
-	pub creator:String,
-	pub game_id:GameID,
-}
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum IntoMapInfoOwnedError{
-	DisplayName(StringValueError),
-	Creator(StringValueError),
-	GameID(ParseGameIDError),
-}
-impl TryFrom<MapInfo<'_>> for MapInfoOwned{
-	type Error=IntoMapInfoOwnedError;
-	fn try_from(value:MapInfo<'_>)->Result<Self,Self::Error>{
-		Ok(Self{
-			display_name:value.display_name.map_err(IntoMapInfoOwnedError::DisplayName)?.to_owned(),
-			creator:value.creator.map_err(IntoMapInfoOwnedError::Creator)?.to_owned(),
-			game_id:value.game_id.map_err(IntoMapInfoOwnedError::GameID)?,
-		})
-	}
-}
-
-// Named dummy types for readability
-struct Exists;
-struct Absent;
-
-/// The result of every map check.
-struct MapCheck<'a>{
-	// === METADATA CHECKS ===
-	// The root must be of class Model
-	model_class:StringCheck<'a,(),&'static str>,
-	// Model's name must be in snake case
-	model_name:StringCheck<'a,(),String>,
-	// Map must have a StringValue named DisplayName.
-	// Value must not be empty, must be in title case.
-	display_name:Result<Result<StringCheck<'a,&'a str,String>,StringEmpty>,StringValueError>,
-	// Map must have a StringValue named Creator.
-	// Value must not be empty.
-	creator:Result<Result<&'a str,StringEmpty>,StringValueError>,
-	// The prefix of the model's name must match the game it was submitted for.
-	// bhop_ for bhop, and surf_ for surf
-	game_id:Result<GameID,ParseGameIDError>,
-
-	// === MODE CHECKS ===
-	// MapStart must exist
-	mapstart:Result<Exists,Absent>,
-	// No duplicate map starts (including bonuses)
-	mode_start_counts:DuplicateCheck<ModeID,Vec<&'a Instance>>,
-	// At least one finish zone for each start zone, and no finishes with no start
-	mode_finish_counts:SetDifferenceCheck<SetDifferenceCheckContextAtLeastOne<ModeID,Vec<&'a Instance>>>,
-	// Check for dangling MapAnticheat zones (no associated MapStart)
-	mode_anticheat_counts:SetDifferenceCheck<SetDifferenceCheckContextAllowNone<ModeID,Vec<&'a Instance>>>,
-	// Spawn1 must exist
-	spawn1:Result<Exists,Absent>,
-	// Check for dangling Teleport# (no associated Spawn#)
-	teleport_counts:SetDifferenceCheck<SetDifferenceCheckContextAllowNone<StageID,Vec<&'a Instance>>>,
-	// No duplicate Spawn#
-	spawn_counts:DuplicateCheck<StageID,u64>,
-	// Check for dangling WormholeIn# (no associated WormholeOut#)
-	wormhole_in_counts:SetDifferenceCheck<SetDifferenceCheckContextAtLeastOne<WormholeID,u64>>,
-	// No duplicate WormholeOut# (duplicate WormholeIn# ok)
-	// No dangling WormholeOut#
-	wormhole_out_counts:DuplicateCheck<WormholeID,u64>,
-
-	// === GENERAL CHECKS ===
-	unanchored_parts:Result<(),Vec<&'a Instance>>,
-}
-
-impl<'a> ModelInfo<'a>{
-	fn check(self)->MapCheck<'a>{
-		// Check class is exactly "Model"
-		let model_class=StringCheckContext{
-			observed:self.model_class,
-			expected:"Model",
-		}.check(());
-
-		// Check model name is snake case
-		let model_name=StringCheckContext{
-			observed:self.model_name,
-			expected:self.model_name.to_snake_case(),
-		}.check(());
-
-		// Check display name is not empty and has title case
-		let display_name=self.map_info.display_name.map(|display_name|{
-			check_empty(display_name).map(|display_name|StringCheckContext{
-				observed:display_name,
-				expected:display_name.to_title_case(),
-			}.check(display_name))
-		});
-
-		// Check Creator is not empty
-		let creator=self.map_info.creator.map(check_empty);
-
-		// Check GameID (model name was prefixed with bhop_ surf_ etc)
-		let game_id=self.map_info.game_id;
-
-		// MapStart must exist
-		let mapstart=if self.counts.mode_start_counts.contains_key(&ModeID::MAIN){
-			Ok(Exists)
-		}else{
-			Err(Absent)
-		};
-
-		// Spawn1 must exist
-		let spawn1=if self.counts.spawn_counts.contains_key(&StageID::FIRST){
-			Ok(Exists)
-		}else{
-			Err(Absent)
-		};
-
-		// Check that at least one finish zone exists for each start zone.
-		// This also checks that there are no finish zones without a corresponding start zone.
-		let mode_finish_counts=SetDifferenceCheckContextAtLeastOne::new(self.counts.mode_finish_counts)
-			.check(&self.counts.mode_start_counts);
-
-		// Check that there are no anticheat zones without a corresponding start zone.
-		// Modes are allowed to have 0 anticheat zones.
-		let mode_anticheat_counts=SetDifferenceCheckContextAllowNone::new(self.counts.mode_anticheat_counts)
-			.check(&self.counts.mode_start_counts);
-
-		// There must be exactly one start zone for every mode in the map.
-		let mode_start_counts=DuplicateCheckContext(self.counts.mode_start_counts).check(|c|1<c.len());
-
-		// Check that there are no Teleports without a corresponding Spawn.
-		// Spawns are allowed to have 0 Teleports.
-		let teleport_counts=SetDifferenceCheckContextAllowNone::new(self.counts.teleport_counts)
-			.check(&self.counts.spawn_counts);
-
-		// There must be exactly one of any perticular spawn id in the map.
-		let spawn_counts=DuplicateCheckContext(self.counts.spawn_counts).check(|&c|1<c);
-
-		// Check that at least one WormholeIn exists for each WormholeOut.
-		// This also checks that there are no WormholeIn without a corresponding WormholeOut.
-		let wormhole_in_counts=SetDifferenceCheckContextAtLeastOne::new(self.counts.wormhole_in_counts)
-			.check(&self.counts.wormhole_out_counts);
-
-		// There must be exactly one of any perticular wormhole out id in the map.
-		let wormhole_out_counts=DuplicateCheckContext(self.counts.wormhole_out_counts).check(|&c|1<c);
-
-		// There must not be any unanchored parts
-		let unanchored_parts=if self.unanchored_parts.is_empty(){
-			Ok(())
-		}else{
-			Err(self.unanchored_parts)
-		};
-
-		MapCheck{
-			model_class,
-			model_name,
-			display_name,
-			creator,
-			game_id,
-			mapstart,
-			mode_start_counts,
-			mode_finish_counts,
-			mode_anticheat_counts,
-			spawn1,
-			teleport_counts,
-			spawn_counts,
-			wormhole_in_counts,
-			wormhole_out_counts,
-			unanchored_parts,
-		}
-	}
-}
-
-impl MapCheck<'_>{
-	fn result(self)->Result<MapInfoOwned,Result<MapCheckList,serde_json::Error>>{
-		match self{
-			MapCheck{
-				model_class:StringCheck(Ok(())),
-				model_name:StringCheck(Ok(())),
-				display_name:Ok(Ok(StringCheck(Ok(display_name)))),
-				creator:Ok(Ok(creator)),
-				game_id:Ok(game_id),
-				mapstart:Ok(Exists),
-				mode_start_counts:DuplicateCheck(Ok(())),
-				mode_finish_counts:SetDifferenceCheck(Ok(())),
-				mode_anticheat_counts:SetDifferenceCheck(Ok(())),
-				spawn1:Ok(Exists),
-				teleport_counts:SetDifferenceCheck(Ok(())),
-				spawn_counts:DuplicateCheck(Ok(())),
-				wormhole_in_counts:SetDifferenceCheck(Ok(())),
-				wormhole_out_counts:DuplicateCheck(Ok(())),
-				unanchored_parts:Ok(()),
-			}=>{
-				Ok(MapInfoOwned{
-					display_name:display_name.to_owned(),
-					creator:creator.to_owned(),
-					game_id,
-				})
-			},
-			other=>Err(other.itemize()),
-		}
-	}
-}
-
-struct Separated<F>{
-	f:F,
-	separator:&'static str,
-}
-impl<F> Separated<F>{
-	fn new(separator:&'static str,f:F)->Self{
-		Self{separator,f}
-	}
-}
-impl<F,I,D> std::fmt::Display for Separated<F>
-	where
-		D:std::fmt::Display,
-		I:IntoIterator<Item=D>,
-		F:Fn()->I,
-{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		let mut it=(self.f)().into_iter();
-		if let Some(first)=it.next(){
-			write!(f,"{first}")?;
-			for item in it{
-				write!(f,"{}{item}",self.separator)?;
-			}
-		}
-		Ok(())
-	}
-}
-
-struct Duplicates<D>{
-	display:D,
-	duplicates:usize,
-}
-impl<D> Duplicates<D>{
-	fn new(display:D,duplicates:usize)->Self{
-		Self{
-			display,
-			duplicates,
-		}
-	}
-}
-impl<D:std::fmt::Display> std::fmt::Display for Duplicates<D>{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{} ({} duplicates)",self.display,self.duplicates)
-	}
-}
-
-
-macro_rules! passed{
-	($name:literal)=>{
-		Check{
-			name:$name.to_owned(),
-			summary:String::new(),
-			passed:true,
-		}
-	}
-}
-macro_rules! summary{
-	($name:literal,$summary:expr)=>{
-		Check{
-			name:$name.to_owned(),
-			summary:$summary,
-			passed:false,
-		}
-	};
-}
-macro_rules! summary_format{
-	($name:literal,$fmt:literal)=>{
-		Check{
-			name:$name.to_owned(),
-			summary:format!($fmt),
-			passed:false,
-		}
-	};
-}
-
-// Generate an error message for each observed issue separated by newlines.
-// This defines MapCheck.to_string() which is used in MapCheck.result()
-impl MapCheck<'_>{
-	fn itemize(&self)->Result<MapCheckList,serde_json::Error>{
-		let model_class=match &self.model_class{
-			StringCheck(Ok(()))=>passed!("ModelClass"),
-			StringCheck(Err(context))=>summary_format!("ModelClass","Invalid model class: {context}"),
-		};
-		let model_name=match &self.model_name{
-			StringCheck(Ok(()))=>passed!("ModelName"),
-			StringCheck(Err(context))=>summary_format!("ModelName","Model name must have snake_case: {context}"),
-		};
-		let display_name=match &self.display_name{
-			Ok(Ok(StringCheck(Ok(_))))=>passed!("DisplayName"),
-			Ok(Ok(StringCheck(Err(context))))=>summary_format!("DisplayName","DisplayName must have Title Case: {context}"),
-			Ok(Err(context))=>summary_format!("DisplayName","Invalid DisplayName: {context}"),
-			Err(StringValueError::ObjectNotFound)=>summary!("DisplayName","Missing DisplayName StringValue".to_owned()),
-			Err(StringValueError::ValueNotSet)=>summary!("DisplayName","DisplayName Value not set".to_owned()),
-			Err(StringValueError::NonStringValue)=>summary!("DisplayName","DisplayName Value is not a String".to_owned()),
-		};
-		let creator=match &self.creator{
-			Ok(Ok(_))=>passed!("Creator"),
-			Ok(Err(context))=>summary_format!("Creator","Invalid Creator: {context}"),
-			Err(StringValueError::ObjectNotFound)=>summary!("Creator","Missing Creator StringValue".to_owned()),
-			Err(StringValueError::ValueNotSet)=>summary!("Creator","Creator Value not set".to_owned()),
-			Err(StringValueError::NonStringValue)=>summary!("Creator","Creator Value is not a String".to_owned()),
-		};
-		let game_id=match &self.game_id{
-			Ok(_)=>passed!("GameID"),
-			Err(ParseGameIDError)=>summary!("GameID","Model name must be prefixed with bhop_ surf_ or flytrials_".to_owned()),
-		};
-		let mapstart=match &self.mapstart{
-			Ok(Exists)=>passed!("MapStart"),
-			Err(Absent)=>summary_format!("MapStart","Model has no MapStart"),
-		};
-		let duplicate_start=match &self.mode_start_counts{
-			DuplicateCheck(Ok(()))=>passed!("DuplicateStart"),
-			DuplicateCheck(Err(DuplicateCheckContext(context)))=>{
-				let context=Separated::new(", ",||context.iter().map(|(&mode_id,instances)|
-					Duplicates::new(ModeElement{zone:Zone::Start,mode_id},instances.len())
-				));
-				summary_format!("DuplicateStart","Duplicate start zones: {context}")
-			}
-		};
-		let (extra_finish,missing_finish)=match &self.mode_finish_counts{
-			SetDifferenceCheck(Ok(()))=>(passed!("DanglingFinish"),passed!("MissingFinish")),
-			SetDifferenceCheck(Err(context))=>(
-				if context.extra.is_empty(){
-					passed!("DanglingFinish")
-				}else{
-					let plural=if context.extra.len()==1{"zone"}else{"zones"};
-					let context=Separated::new(", ",||context.extra.iter().map(|(&mode_id,_instances)|
-						ModeElement{zone:Zone::Finish,mode_id}
-					));
-					summary_format!("DanglingFinish","No matching start zone for finish {plural}: {context}")
-				},
-				if context.missing.is_empty(){
-					passed!("MissingFinish")
-				}else{
-					let plural=if context.missing.len()==1{"zone"}else{"zones"};
-					let context=Separated::new(", ",||context.missing.iter().map(|&mode_id|
-						ModeElement{zone:Zone::Finish,mode_id}
-					));
-					summary_format!("MissingFinish","Missing finish {plural}: {context}")
-				}
-			),
-		};
-		let dangling_anticheat=match &self.mode_anticheat_counts{
-			SetDifferenceCheck(Ok(()))=>passed!("DanglingAnticheat"),
-			SetDifferenceCheck(Err(context))=>{
-				if context.extra.is_empty(){
-					passed!("DanglingAnticheat")
-				}else{
-					let plural=if context.extra.len()==1{"zone"}else{"zones"};
-					let context=Separated::new(", ",||context.extra.iter().map(|(&mode_id,_instances)|
-						ModeElement{zone:Zone::Anticheat,mode_id}
-					));
-					summary_format!("DanglingAnticheat","No matching start zone for anticheat {plural}: {context}")
-				}
-			}
-		};
-		let spawn1=match &self.spawn1{
-			Ok(Exists)=>passed!("Spawn1"),
-			Err(Absent)=>summary_format!("Spawn1","Model has no Spawn1"),
-		};
-		let dangling_teleport=match &self.teleport_counts{
-			SetDifferenceCheck(Ok(()))=>passed!("DanglingTeleport"),
-			SetDifferenceCheck(Err(context))=>{
-				let unique_names:HashSet<_>=context.extra.values().flat_map(|instances|
-					instances.iter().map(|instance|instance.name.as_str())
-				).collect();
-				let plural=if unique_names.len()==1{"object"}else{"objects"};
-				let context=Separated::new(", ",||&unique_names);
-				summary_format!("DanglingTeleport","No matching Spawn for {plural}: {context}")
-			}
-		};
-		let duplicate_spawns=match &self.spawn_counts{
-			DuplicateCheck(Ok(()))=>passed!("DuplicateSpawn"),
-			DuplicateCheck(Err(DuplicateCheckContext(context)))=>{
-				let context=Separated::new(", ",||context.iter().map(|(&stage_id,&instances)|
-					Duplicates::new(StageElement{behaviour:StageElementBehaviour::Spawn,stage_id},instances as usize)
-				));
-				summary_format!("DuplicateSpawn","Duplicate Spawn: {context}")
-			}
-		};
-		let (extra_wormhole_in,missing_wormhole_in)=match &self.wormhole_in_counts{
-			SetDifferenceCheck(Ok(()))=>(passed!("ExtraWormholeIn"),passed!("MissingWormholeIn")),
-			SetDifferenceCheck(Err(context))=>(
-				if context.extra.is_empty(){
-					passed!("ExtraWormholeIn")
-				}else{
-					let context=Separated::new(", ",||context.extra.iter().map(|(&wormhole_id,_instances)|
-						WormholeElement{behaviour:WormholeBehaviour::In,wormhole_id}
-					));
-					summary_format!("ExtraWormholeIn","WormholeIn with no matching WormholeOut: {context}")
-				},
-				if context.missing.is_empty(){
-					passed!("MissingWormholeIn")
-				}else{
-					// This counts WormholeIn objects, but
-					// flipped logic is easier to understand
-					let context=Separated::new(", ",||context.missing.iter().map(|&wormhole_id|
-						WormholeElement{behaviour:WormholeBehaviour::Out,wormhole_id}
-					));
-					summary_format!("MissingWormholeIn","WormholeOut with no matching WormholeIn: {context}")
-				}
-			)
-		};
-		let duplicate_wormhole_out=match &self.wormhole_out_counts{
-			DuplicateCheck(Ok(()))=>passed!("DuplicateWormholeOut"),
-			DuplicateCheck(Err(DuplicateCheckContext(context)))=>{
-				let context=Separated::new(", ",||context.iter().map(|(&wormhole_id,&instances)|
-					Duplicates::new(WormholeElement{behaviour:WormholeBehaviour::Out,wormhole_id},instances as usize)
-				));
-				summary_format!("DuplicateWormholeOut","Duplicate WormholeOut: {context}")
-			}
-		};
-		let unanchored_parts=match &self.unanchored_parts{
-			Ok(())=>passed!("UnanchoredParts"),
-			Err(unanchored_parts)=>{
-				let count=unanchored_parts.len();
-				let plural=if count==1{"part"}else{"parts"};
-				let context=Separated::new(", ",||unanchored_parts.iter().map(|&instance|
-					instance.name.as_str()
-				).take(20));
-				summary_format!("UnanchoredParts","{count} unanchored {plural}: {context}")
-			}
-		};
-		Ok(MapCheckList{checks:vec![
-			model_class,
-			model_name,
-			display_name,
-			creator,
-			game_id,
-			mapstart,
-			duplicate_start,
-			extra_finish,
-			missing_finish,
-			dangling_anticheat,
-			spawn1,
-			dangling_teleport,
-			duplicate_spawns,
-			extra_wormhole_in,
-			missing_wormhole_in,
-			duplicate_wormhole_out,
-			unanchored_parts,
-		]})
-	}
-}
-
-#[derive(serde::Serialize)]
-pub struct MapCheckList{
-	pub checks:Vec<Check>,
-}
-
-pub struct CheckListAndVersion{
-	pub status:Result<MapInfoOwned,MapCheckList>,
-	pub version:u64,
-}
-
-impl crate::message_handler::MessageHandler{
-	pub async fn check_inner(&self,check_info:CheckRequest)->Result<CheckListAndVersion,Error>{
-		// discover asset creator and latest version
-		let info=self.cloud_context.get_asset_info(
-			rbx_asset::cloud::GetAssetLatestRequest{asset_id:check_info.ModelID}
-		).await.map_err(Error::ModelInfoDownload)?;
-
-		// reject models created by a group
-		let rbx_asset::cloud::Creator::userId(_user_id)=info.creationContext.creator else{
-			return Err(Error::CreatorTypeMustBeUser);
-		};
-
-		// parse model version string
-		let version=info.revisionId;
-
-		let maybe_gzip=download_asset_version(&self.cloud_context,rbx_asset::cloud::GetAssetVersionRequest{
-			asset_id:check_info.ModelID,
-			version,
-		}).await.map_err(Error::Download)?;
-
-		// decode dom (slow!)
-		let dom=maybe_gzip.read_with(read_dom,read_dom).map_err(Error::ModelFileDecode)?;
-
-		// extract the root instance
-		let model_instance=get_root_instance(&dom).map_err(Error::GetRootInstance)?;
-
-		// skip checks
-		if check_info.SkipChecks{
-			// extract required fields
-			let map_info=get_mapinfo(&dom,model_instance);
-			let map_info_owned=map_info.try_into().map_err(Error::IntoMapInfoOwned)?;
-			let status=Ok(map_info_owned);
-
-			// return early
-			return Ok(CheckListAndVersion{status,version});
-		}
-
-		// extract information from the model
-		let model_info=get_model_info(&dom,model_instance);
-
-		// convert the model information into a structured report
-		let map_check=model_info.check();
-
-		// check the report, generate an error message if it fails the check
-		let status=match map_check.result(){
-			Ok(map_info)=>Ok(map_info),
-			Err(Ok(check_list))=>Err(check_list),
-			Err(Err(e))=>return Err(Error::ToJsonValue(e)),
-		};
-
-		Ok(CheckListAndVersion{status,version})
-	}
-}

validation/src/check_mapfix.rs

@@ -1,69 +0,0 @@
-use crate::check::CheckListAndVersion;
-use crate::nats_types::CheckMapfixRequest;
-
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum Error{
-	Check(crate::check::Error),
-	ApiActionMapfixCheck(tonic::Status),
-}
-impl std::fmt::Display for Error{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for Error{}
-
-impl crate::message_handler::MessageHandler{
-	pub async fn check_mapfix(&self,check_info:CheckMapfixRequest)->Result<(),Error>{
-		let mapfix_id=check_info.MapfixID;
-		let check_result=self.check_inner(check_info.into()).await;
-
-		// update the mapfix depending on the result
-		match check_result{
-			Ok(CheckListAndVersion{status:Ok(map_info),version})=>{
-				self.mapfixes.set_status_submitted(
-					rust_grpc::validator::SubmittedRequest{
-						id:mapfix_id,
-						model_version:version,
-						display_name:map_info.display_name,
-						creator:map_info.creator,
-						game_id:map_info.game_id as u32,
-					}
-				).await.map_err(Error::ApiActionMapfixCheck)?;
-
-				// Do not proceed to request changes
-				return Ok(());
-			},
-			// update the mapfix model status to request changes
-			Ok(CheckListAndVersion{status:Err(check_list),..})=>{
-				self.mapfixes.create_audit_checklist(
-					rust_grpc::validator::AuditChecklistRequest{
-						id:mapfix_id,
-						check_list:check_list.checks,
-					}
-				).await.map_err(Error::ApiActionMapfixCheck)?;
-			},
-			// update the mapfix model status to request changes
-			Err(e)=>{
-				// log error
-				println!("[check_mapfix] Error: {e}");
-
-				self.mapfixes.create_audit_error(
-					rust_grpc::validator::AuditErrorRequest{
-						id:mapfix_id,
-						error_message:e.to_string(),
-					}
-				).await.map_err(Error::ApiActionMapfixCheck)?;
-			},
-		}
-
-		self.mapfixes.set_status_request_changes(
-			rust_grpc::validator::MapfixId{
-				id:mapfix_id,
-			}
-		).await.map_err(Error::ApiActionMapfixCheck)?;
-
-		Ok(())
-	}
-}

validation/src/check_submission.rs

@@ -1,70 +0,0 @@
-use crate::check::CheckListAndVersion;
-use crate::nats_types::CheckSubmissionRequest;
-
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum Error{
-	Check(crate::check::Error),
-	ApiActionSubmissionCheck(tonic::Status),
-}
-impl std::fmt::Display for Error{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for Error{}
-
-impl crate::message_handler::MessageHandler{
-	pub async fn check_submission(&self,check_info:CheckSubmissionRequest)->Result<(),Error>{
-		let submission_id=check_info.SubmissionID;
-		let check_result=self.check_inner(check_info.into()).await;
-
-		// update the submission depending on the result
-		match check_result{
-			// update the submission model status to submitted
-			Ok(CheckListAndVersion{status:Ok(map_info),version})=>{
-				self.submissions.set_status_submitted(
-					rust_grpc::validator::SubmittedRequest{
-						id:submission_id,
-						model_version:version,
-						display_name:map_info.display_name,
-						creator:map_info.creator,
-						game_id:map_info.game_id as u32,
-					}
-				).await.map_err(Error::ApiActionSubmissionCheck)?;
-
-				// Do not proceed to request changes
-				return Ok(());
-			},
-			// update the submission model status to request changes
-			Ok(CheckListAndVersion{status:Err(check_list),..})=>{
-				self.submissions.create_audit_checklist(
-				rust_grpc::validator::AuditChecklistRequest{
-					id:submission_id,
-					check_list:check_list.checks,
-				}
-			).await.map_err(Error::ApiActionSubmissionCheck)?;
-			},
-			// update the submission model status to request changes
-			Err(e)=>{
-				// log error
-				println!("[check_submission] Error: {e}");
-
-				self.submissions.create_audit_error(
-					rust_grpc::validator::AuditErrorRequest{
-						id:submission_id,
-						error_message:e.to_string(),
-					}
-				).await.map_err(Error::ApiActionSubmissionCheck)?;
-			},
-		}
-
-		self.submissions.set_status_request_changes(
-			rust_grpc::validator::SubmissionId{
-				id:submission_id,
-			}
-		).await.map_err(Error::ApiActionSubmissionCheck)?;
-
-		Ok(())
-	}
-}

validation/src/create.rs

@@ -1,73 +0,0 @@
-use crate::download::download_asset_version;
-use crate::rbx_util::{get_root_instance,get_mapinfo,read_dom,MapInfo,ReadDomError,GetRootInstanceError,GameID};
-
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum Error{
-	CreatorTypeMustBeUser,
-	ModelInfoDownload(rbx_asset::cloud::GetError),
-	Download(crate::download::Error),
-	ModelFileDecode(ReadDomError),
-	GetRootInstance(GetRootInstanceError),
-}
-impl std::fmt::Display for Error{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for Error{}
-
-#[allow(nonstandard_style)]
-pub struct CreateRequest{
-	pub ModelID:u64,
-}
-#[allow(nonstandard_style)]
-pub struct CreateResult{
-	pub AssetOwner:u64,
-	pub DisplayName:Option<String>,
-	pub Creator:Option<String>,
-	pub GameID:Option<GameID>,
-	pub AssetVersion:u64,
-}
-impl crate::message_handler::MessageHandler{
-	pub async fn create_inner(&self,create_info:CreateRequest)->Result<CreateResult,Error>{
-		// discover asset creator and latest version
-		let info=self.cloud_context.get_asset_info(
-			rbx_asset::cloud::GetAssetLatestRequest{asset_id:create_info.ModelID}
-		).await.map_err(Error::ModelInfoDownload)?;
-
-		// reject models created by a group
-		let rbx_asset::cloud::Creator::userId(user_id)=info.creationContext.creator else{
-			return Err(Error::CreatorTypeMustBeUser);
-		};
-
-		let asset_version=info.revisionId;
-
-		// download the map model
-		let maybe_gzip=download_asset_version(&self.cloud_context,rbx_asset::cloud::GetAssetVersionRequest{
-			asset_id:create_info.ModelID,
-			version:asset_version,
-		}).await.map_err(Error::Download)?;
-
-		// decode dom (slow!)
-		let dom=maybe_gzip.read_with(read_dom,read_dom).map_err(Error::ModelFileDecode)?;
-
-		// extract the root instance
-		let model_instance=get_root_instance(&dom).map_err(Error::GetRootInstance)?;
-
-		// parse create fields out of asset
-		let MapInfo{
-			display_name,
-			creator,
-			game_id,
-		}=get_mapinfo(&dom,model_instance);
-
-		Ok(CreateResult{
-			AssetOwner:user_id,
-			DisplayName:display_name.ok().map(ToOwned::to_owned),
-			Creator:creator.ok().map(ToOwned::to_owned),
-			GameID:game_id.ok(),
-			AssetVersion:asset_version,
-		})
-	}
-}

validation/src/create_mapfix.rs

@@ -1,57 +0,0 @@
-use crate::nats_types::CreateMapfixRequest;
-use crate::create::CreateRequest;
-
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum Error{
-	Create(crate::create::Error),
-	ApiActionMapfixCreate(tonic::Status),
-}
-impl std::fmt::Display for Error{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for Error{}
-
-impl crate::message_handler::MessageHandler{
-	async fn create_mapfix_inner(&self,create_info:CreateMapfixRequest)->Result<(),Error>{
-		// call deduplicated inner code
-		let create_request=self.create_inner(CreateRequest{
-			ModelID:create_info.ModelID,
-		}).await.map_err(Error::Create)?;
-
-		// call create on api
-		self.mapfixes.create(rust_grpc::validator::MapfixCreate{
-			operation_id:create_info.OperationID,
-			asset_owner:create_request.AssetOwner,
-			display_name:create_request.DisplayName.unwrap_or_default(),
-			creator:create_request.Creator.unwrap_or_default(),
-			// not great TODO: make this great
-			game_id:create_request.GameID.unwrap_or(crate::rbx_util::GameID::Bhop) as u32,
-			asset_id:create_info.ModelID,
-			asset_version:create_request.AssetVersion,
-			target_asset_id:create_info.TargetAssetID,
-			description:create_info.Description,
-		}).await.map_err(Error::ApiActionMapfixCreate)?;
-
-		Ok(())
-	}
-	pub async fn create_mapfix(&self,create_info:CreateMapfixRequest)->Result<(),tonic::Status>{
-		let operation_id=create_info.OperationID;
-
-		let create_result=self.create_mapfix_inner(create_info).await;
-
-		if let Err(e)=create_result{
-			// log error
-			println!("[create_mapfix] Error: {e}");
-
-			self.operations.fail(rust_grpc::validator::OperationFailRequest{
-				operation_id,
-				status_message:e.to_string(),
-			}).await?;
-		}
-
-		Ok(())
-	}
-}

validation/src/create_submission.rs

@@ -1,71 +0,0 @@
-use crate::nats_types::CreateSubmissionRequest;
-use crate::create::CreateRequest;
-use crate::rbx_util::GameID;
-
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum Error{
-	Create(crate::create::Error),
-	ApiActionSubmissionCreate(tonic::Status),
-}
-impl std::fmt::Display for Error{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for Error{}
-
-impl crate::message_handler::MessageHandler{
-	async fn create_submission_inner(&self,create_info:CreateSubmissionRequest)->Result<(),Error>{
-		let create_request=self.create_inner(CreateRequest{
-			ModelID:create_info.ModelID,
-		}).await.map_err(Error::Create)?;
-
-		// grab values from submission form, otherwise try to fill blanks from map data
-		let display_name=if create_info.DisplayName.is_empty(){
-			create_request.DisplayName.unwrap_or_default()
-		}else{
-			create_info.DisplayName
-		};
-
-		let creator=if create_info.Creator.is_empty(){
-			create_request.Creator.unwrap_or_default()
-		}else{
-			create_info.Creator
-		};
-
-		let game_id=create_info.GameID.try_into().ok().or(create_request.GameID).unwrap_or(GameID::Bhop);
-
-		// call create on api
-		self.submissions.create(rust_grpc::validator::SubmissionCreate{
-			operation_id:create_info.OperationID,
-			asset_owner:create_request.AssetOwner,
-			display_name:display_name,
-			creator:creator,
-			game_id:game_id as u32,
-			asset_id:create_info.ModelID,
-			asset_version:create_request.AssetVersion,
-			status:create_info.Status,
-			roles:create_info.Roles,
-		}).await.map_err(Error::ApiActionSubmissionCreate)?;
-
-		Ok(())
-	}
-	pub async fn create_submission(&self,create_info:CreateSubmissionRequest)->Result<(),tonic::Status>{
-		let operation_id=create_info.OperationID;
-
-		let create_result=self.create_submission_inner(create_info).await;
-
-		if let Err(e)=create_result{
-			// log error
-			println!("[create_submission] Error: {e}");
-
-			self.operations.fail(rust_grpc::validator::OperationFailRequest{
-				operation_id:operation_id,
-				status_message:e.to_string(),
-			}).await?;
-		}
-
-		Ok(())
-	}
-}

validation/src/download.rs

@@ -1,26 +0,0 @@
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum Error{
-	ModelLocationDownload(rbx_asset::cloud::GetError),
-	NonFreeModel,
-	ModelFileDownload(rbx_asset::cloud::GetError),
-}
-impl std::fmt::Display for Error{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for Error{}
-
-pub async fn download_asset_version(cloud_context:&rbx_asset::cloud::Context,request:rbx_asset::cloud::GetAssetVersionRequest)->Result<rbx_asset::types::MaybeGzippedBytes,Error>{
-	// download the location of the map model
-	let location=cloud_context.get_asset_version_location(request).await.map_err(Error::ModelLocationDownload)?;
-
-	// if the location does not exist, you are not allowed to download it
-	let location=location.location.ok_or(Error::NonFreeModel)?;
-
-	// download the map model
-	let maybe_gzip=cloud_context.get_asset(&location).await.map_err(Error::ModelFileDownload)?;
-
-	Ok(maybe_gzip)
-}

validation/src/grpc/error.rs

@@ -1,19 +0,0 @@
-use rust_grpc::validator::{ScriptId,ScriptPolicyId};
-
-#[derive(Debug)]
-#[expect(dead_code)]
-pub enum SingleItemError<Items>{
-	DuplicateItems(Items),
-	Other(tonic::Status),
-}
-impl<Items> std::fmt::Display for SingleItemError<Items>
-where
-	Items:std::fmt::Debug
-{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl<Items> std::error::Error for SingleItemError<Items> where Items:std::fmt::Debug{}
-pub type ScriptSingleItemError=SingleItemError<Vec<ScriptId>>;
-pub type ScriptPolicySingleItemError=SingleItemError<Vec<ScriptPolicyId>>;

validation/src/grpc/mapfixes.rs

@@ -1,23 +0,0 @@
-use crate::endpoint;
-use rust_grpc::validator::*;
-pub type ValidatorMapfixesServiceClient=rust_grpc::validator::validator_mapfix_service_client::ValidatorMapfixServiceClient<tonic::transport::channel::Channel>;
-#[derive(Clone)]
-pub struct Service{
-	client:ValidatorMapfixesServiceClient,
-}
-impl Service{
-	pub fn new(
-		client:ValidatorMapfixesServiceClient,
-	)->Self{
-		Self{client}
-	}
-	endpoint!(create,MapfixCreate,MapfixId);
-	endpoint!(create_audit_error,AuditErrorRequest,NullResponse);
-	endpoint!(create_audit_checklist,AuditChecklistRequest,NullResponse);
-	endpoint!(set_validated_model,ValidatedModelRequest,NullResponse);
-	endpoint!(set_status_submitted,SubmittedRequest,NullResponse);
-	endpoint!(set_status_request_changes,MapfixId,NullResponse);
-	endpoint!(set_status_validated,MapfixId,NullResponse);
-	endpoint!(set_status_failed,MapfixId,NullResponse);
-	endpoint!(set_status_uploaded,MapfixId,NullResponse);
-}

validation/src/grpc/mod.rs

@@ -1,17 +0,0 @@
-
-pub mod error;
-
-pub mod mapfixes;
-pub mod operations;
-pub mod scripts;
-pub mod script_policy;
-pub mod submissions;
-
-#[macro_export]
-macro_rules! endpoint{
-	($fn:ident,$in:ident,$out:ident)=>{
-		pub async fn $fn(&self,request:$in)->Result<$out,tonic::Status>{
-			Ok(self.client.clone().$fn(request).await?.into_inner())
-		}
-	};
-}

validation/src/grpc/operations.rs

@@ -1,15 +0,0 @@
-use crate::endpoint;
-use rust_grpc::validator::*;
-pub type ValidatorOperationsServiceClient=rust_grpc::validator::validator_operation_service_client::ValidatorOperationServiceClient<tonic::transport::channel::Channel>;
-#[derive(Clone)]
-pub struct Service{
-	client:ValidatorOperationsServiceClient,
-}
-impl Service{
-	pub fn new(
-		client:ValidatorOperationsServiceClient,
-	)->Self{
-		Self{client}
-	}
-	endpoint!(fail,OperationFailRequest,NullResponse);
-}

validation/src/grpc/script_policy.rs

@@ -1,34 +0,0 @@
-use crate::endpoint;
-use crate::grpc::error::ScriptPolicySingleItemError;
-use rust_grpc::validator::*;
-pub type ValidatorScriptPolicyServiceClient=rust_grpc::validator::validator_script_policy_service_client::ValidatorScriptPolicyServiceClient<tonic::transport::channel::Channel>;
-#[derive(Clone)]
-pub struct Service{
-	client:ValidatorScriptPolicyServiceClient,
-}
-impl Service{
-	pub fn new(
-		client:ValidatorScriptPolicyServiceClient,
-	)->Self{
-		Self{client}
-	}
-	endpoint!(create,ScriptPolicyCreate,ScriptPolicyId);
-	endpoint!(list,ScriptPolicyListRequest,ScriptPolicyListResponse);
-	pub async fn get_from_hash(&self,hash:u64)->Result<Option<ScriptPolicy>,ScriptPolicySingleItemError>{
-		let policies=self.list(ScriptPolicyListRequest{
-			filter:Some(ScriptPolicyFilter{
-				from_script_hash:Some(hash),
-				to_script_id:None,
-				policy:None,
-			}),
-			page:Some(Pagination{
-				number:1,
-				size:2,
-			}),
-		}).await.map_err(ScriptPolicySingleItemError::Other)?;
-		if 1<policies.script_policies.len(){
-			return Err(ScriptPolicySingleItemError::DuplicateItems(policies.script_policies.into_iter().map(|item|ScriptPolicyId{id:item.id}).collect()));
-		}
-		Ok(policies.script_policies.into_iter().next())
-	}
-}

validation/src/grpc/scripts.rs

@@ -1,37 +0,0 @@
-use crate::endpoint;
-use crate::grpc::error::ScriptSingleItemError;
-use rust_grpc::validator::*;
-pub type ValidatorScriptsServiceClient=rust_grpc::validator::validator_script_service_client::ValidatorScriptServiceClient<tonic::transport::channel::Channel>;
-#[derive(Clone)]
-pub struct Service{
-	client:ValidatorScriptsServiceClient,
-}
-impl Service{
-	pub fn new(
-		client:ValidatorScriptsServiceClient,
-	)->Self{
-		Self{client}
-	}
-	endpoint!(create,ScriptCreate,ScriptId);
-	endpoint!(get,ScriptId,Script);
-	endpoint!(list,ScriptListRequest,ScriptListResponse);
-	pub async fn get_from_hash(&self,hash:u64)->Result<Option<Script>,ScriptSingleItemError>{
-		let policies=self.list(ScriptListRequest{
-			filter:Some(ScriptFilter{
-				hash:Some(hash),
-				name:None,
-				source:None,
-				resource_type:None,
-				resource_id:None,
-			}),
-			page:Some(Pagination{
-				number:1,
-				size:2,
-			}),
-		}).await.map_err(ScriptSingleItemError::Other)?;
-		if 1<policies.scripts.len(){
-			return Err(ScriptSingleItemError::DuplicateItems(policies.scripts.into_iter().map(|item|ScriptId{id:item.id}).collect()));
-		}
-		Ok(policies.scripts.into_iter().next())
-	}
-}

validation/src/grpc/submissions.rs

@@ -1,23 +0,0 @@
-use crate::endpoint;
-use rust_grpc::validator::*;
-pub type ValidatorSubmissionsServiceClient=rust_grpc::validator::validator_submission_service_client::ValidatorSubmissionServiceClient<tonic::transport::channel::Channel>;
-#[derive(Clone)]
-pub struct Service{
-	client:ValidatorSubmissionsServiceClient,
-}
-impl Service{
-	pub fn new(
-		client:ValidatorSubmissionsServiceClient,
-	)->Self{
-		Self{client}
-	}
-	endpoint!(create,SubmissionCreate,SubmissionId);
-	endpoint!(create_audit_error,AuditErrorRequest,NullResponse);
-	endpoint!(create_audit_checklist,AuditChecklistRequest,NullResponse);
-	endpoint!(set_validated_model,ValidatedModelRequest,NullResponse);
-	endpoint!(set_status_submitted,SubmittedRequest,NullResponse);
-	endpoint!(set_status_request_changes,SubmissionId,NullResponse);
-	endpoint!(set_status_validated,SubmissionId,NullResponse);
-	endpoint!(set_status_failed,SubmissionId,NullResponse);
-	endpoint!(set_status_uploaded,StatusUploadedRequest,NullResponse);
-}

validation/src/main.rs

@@ -1,33 +1,17 @@
-use futures::StreamExt;
-
-mod download;
-mod grpc;
-mod rbx_util;
-mod message_handler;
-mod nats_types;
 mod types;
-
+mod nats_types;
-mod check;
-mod check_mapfix;
-mod check_submission;
-mod create;
-mod create_mapfix;
-mod create_submission;
-mod upload_mapfix;
-mod upload_submission;
 mod validator;
-mod validate_mapfix;
+mod publish_new;
-mod validate_submission;
+mod publish_fix;
 
 #[allow(dead_code)]
 #[derive(Debug)]
 pub enum StartupError{
-	API(tonic::transport::Error),
+	API(api::ReqwestError),
 	NatsConnect(async_nats::ConnectError),
 	NatsGetStream(async_nats::jetstream::context::GetStreamError),
-	NatsConsumer(async_nats::jetstream::stream::ConsumerError),
+	NatsStartup(types::NatsStartupError),
-	NatsConsumerUpdate(async_nats::jetstream::stream::ConsumerUpdateError),
+	GRPCConnect(tonic::transport::Error),
-	NatsStream(async_nats::jetstream::consumer::StreamError),
 }
 impl std::fmt::Display for StartupError{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
@@ -36,97 +20,43 @@ impl std::fmt::Display for StartupError{
 }
 impl std::error::Error for StartupError{}
 
-pub const PARALLEL_REQUESTS:usize=16;
+pub const GROUP_STRAFESNET:u64=6980477;
 
 #[tokio::main]
 async fn main()->Result<(),StartupError>{
-	let group_id:Option<u64>=match std::env::var("ROBLOX_GROUP_ID"){
+	// talk to roblox through STRAFESNET_CI2 account
-		Ok(s)=>match s.as_str(){
-			"None"=>None,
-			_=>Some(s.parse().expect("ROBLOX_GROUP_ID int parse")),
-		},
-		Err(e)=>panic!("{e}: ROBLOX_GROUP_ID env required"),
-	};
-
-	// create / upload models through STRAFESNET_CI2 account
 	let cookie=std::env::var("RBXCOOKIE").expect("RBXCOOKIE env required");
-	let cookie_context=rbx_asset::cookie::Context::new(rbx_asset::cookie::Cookie::new(cookie));
+	let cookie_context=rbx_asset::cookie::CookieContext::new(rbx_asset::cookie::Cookie::new(cookie));
-	// download models through cloud api
-	let api_key=std::env::var("RBX_API_KEY").expect("RBX_API_KEY env required");
-	let cloud_context=rbx_asset::cloud::Context::new(rbx_asset::cloud::ApiKey::new(api_key));
 
 	// maps-service api
-	let api_host_internal=std::env::var("API_HOST_INTERNAL").expect("API_HOST_INTERNAL env required");
+	let api_host=std::env::var("API_HOST").expect("API_HOST env required");
-	let endpoint=tonic::transport::Endpoint::new(api_host_internal).map_err(StartupError::API)?;
+	let api=api::Context::new(api_host).map_err(StartupError::API)?;
-	let channel=endpoint.connect_lazy();
-	let mapfixes=crate::grpc::mapfixes::ValidatorMapfixesServiceClient::new(channel.clone());
-	let operations=crate::grpc::operations::ValidatorOperationsServiceClient::new(channel.clone());
-	let scripts=crate::grpc::scripts::ValidatorScriptsServiceClient::new(channel.clone());
-	let script_policy=crate::grpc::script_policy::ValidatorScriptPolicyServiceClient::new(channel.clone());
-	let submissions=crate::grpc::submissions::ValidatorSubmissionsServiceClient::new(channel);
-	let message_handler=message_handler::MessageHandler::new(cloud_context,cookie_context,group_id,mapfixes,operations,scripts,script_policy,submissions);
 
 	// nats
 	let nats_host=std::env::var("NATS_HOST").expect("NATS_HOST env required");
-	let nats_fut=async{
+	let nasty=async_nats::connect(nats_host).await.map_err(StartupError::NatsConnect)?;	// use nats jetstream
-		const STREAM_NAME:&str="maptest";
+	let stream=async_nats::jetstream::new(nasty)
-		const DURABLE_NAME:&str="validation";
+		.get_stream("maptest").await.map_err(StartupError::NatsGetStream)?;
-		const FILTER_SUBJECT:&str="maptest.>";
 
-		let nats_config=async_nats::jetstream::consumer::pull::Config{
+	// data-service grpc for creating map entries
-			name:Some(DURABLE_NAME.to_owned()),
+	let data_host=std::env::var("DATA_HOST").expect("DATA_HOST env required");
-			durable_name:Some(DURABLE_NAME.to_owned()),
+	let maps_grpc=crate::types::MapsServiceClient::connect(data_host).await.map_err(StartupError::GRPCConnect)?;
-			filter_subject:FILTER_SUBJECT.to_owned(),
-			..Default::default()
-		};
 
-		let nasty=async_nats::connect(nats_host).await.map_err(StartupError::NatsConnect)?;
+	// connect to nats
+	let (publish_new,publish_fix,validator)=tokio::try_join!(
+		publish_new::Publisher::new(stream.clone(),cookie_context.clone(),api.clone(),maps_grpc),
+		publish_fix::Publisher::new(stream.clone(),cookie_context.clone(),api.clone()),
+		// clone nats here because it's dropped within the function scope,
+		// meanining the last reference is dropped...
+		validator::Validator::new(stream.clone(),cookie_context,api)
+	).map_err(StartupError::NatsStartup)?;
 
-		// use nats jetstream
+	// publisher threads
-		let stream=async_nats::jetstream::new(nasty)
+	tokio::spawn(publish_new.run());
-			.get_stream(STREAM_NAME).await.map_err(StartupError::NatsGetStream)?;
+	tokio::spawn(publish_fix.run());
 
-		let consumer=stream.get_or_create_consumer(DURABLE_NAME,nats_config.clone()).await.map_err(StartupError::NatsConsumer)?;
+	// run validator on the main thread indefinitely
-
+	validator.run().await;
-		// check if config matches expected config
-		if consumer.cached_info().config.filter_subject!=FILTER_SUBJECT{
-			stream.update_consumer(nats_config).await.map_err(StartupError::NatsConsumerUpdate)?;
-		}
-
-		// only need messages
-		consumer.messages().await.map_err(StartupError::NatsStream)
-	};
-
-	// run futures
-	let mut messages=nats_fut.await?;
-
-	// Create a signal listener for SIGTERM
-	let mut sig_term=tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate()).expect("Failed to create SIGTERM signal listener");
-
-	// process up to PARALLEL_REQUESTS in parallel
-	let main_loop=async move{
-		static SEM:tokio::sync::Semaphore=tokio::sync::Semaphore::const_new(PARALLEL_REQUESTS);
-		// use memory leak to make static lifetime
-		let message_handler=Box::leak(Box::new(message_handler));
-		// acquire a permit before attempting to receive a message, exit if either fails
-		while let (Ok(permit),Some(message_result))=(SEM.acquire().await,messages.next().await){
-			// handle the message on a new thread (mainly to decode the model file)
-			tokio::spawn(async{
-				match message_handler.handle_message_result(message_result).await{
-					Ok(())=>println!("[Validation] Success, hooray!"),
-					Err(e)=>println!("[Validation] There was an error, oopsie! {e}"),
-				}
-				// explicitly call drop to make the move semantics and permit release more obvious
-				drop(permit);
-			});
-		}
-	};
-
-	// race sigkill and main loop termination and then die
-	tokio::select!{
-		_=sig_term.recv()=>(),
-		_=main_loop=>(),
-	};
 
 	Ok(())
 }

validation/src/message_handler.rs

@@ -1,78 +0,0 @@
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum HandleMessageError{
-	Messages(async_nats::jetstream::consumer::pull::MessagesError),
-	DoubleAck(async_nats::Error),
-	Json(serde_json::Error),
-	UnknownSubject(String),
-	CreateMapfix(tonic::Status),
-	CreateSubmission(tonic::Status),
-	CheckMapfix(crate::check_mapfix::Error),
-	CheckSubmission(crate::check_submission::Error),
-	UploadMapfix(crate::upload_mapfix::Error),
-	UploadSubmission(crate::upload_submission::Error),
-	ValidateMapfix(crate::validate_mapfix::Error),
-	ValidateSubmission(crate::validate_submission::Error),
-}
-impl std::fmt::Display for HandleMessageError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for HandleMessageError{}
-
-pub type MessageResult=Result<async_nats::jetstream::Message,async_nats::jetstream::consumer::pull::MessagesError>;
-
-fn from_slice<'a,T:serde::de::Deserialize<'a>>(slice:&'a [u8])->Result<T,HandleMessageError>{
-	serde_json::from_slice(slice).map_err(HandleMessageError::Json)
-}
-
-pub struct MessageHandler{
-	pub(crate) cloud_context:rbx_asset::cloud::Context,
-	pub(crate) cookie_context:rbx_asset::cookie::Context,
-	pub(crate) group_id:Option<u64>,
-	pub(crate) mapfixes:crate::grpc::mapfixes::Service,
-	pub(crate) operations:crate::grpc::operations::Service,
-	pub(crate) scripts:crate::grpc::scripts::Service,
-	pub(crate) script_policy:crate::grpc::script_policy::Service,
-	pub(crate) submissions:crate::grpc::submissions::Service,
-}
-
-impl MessageHandler{
-	pub fn new(
-		cloud_context:rbx_asset::cloud::Context,
-		cookie_context:rbx_asset::cookie::Context,
-		group_id:Option<u64>,
-		mapfixes:crate::grpc::mapfixes::ValidatorMapfixesServiceClient,
-		operations:crate::grpc::operations::ValidatorOperationsServiceClient,
-		scripts:crate::grpc::scripts::ValidatorScriptsServiceClient,
-		script_policy:crate::grpc::script_policy::ValidatorScriptPolicyServiceClient,
-		submissions:crate::grpc::submissions::ValidatorSubmissionsServiceClient,
-	)->Self{
-		Self{
-			cloud_context,
-			cookie_context,
-			group_id,
-			mapfixes:crate::grpc::mapfixes::Service::new(mapfixes),
-			operations:crate::grpc::operations::Service::new(operations),
-			scripts:crate::grpc::scripts::Service::new(scripts),
-			script_policy:crate::grpc::script_policy::Service::new(script_policy),
-			submissions:crate::grpc::submissions::Service::new(submissions),
-		}
-	}
-	pub async fn handle_message_result(&self,message_result:MessageResult)->Result<(),HandleMessageError>{
-		let message=message_result.map_err(HandleMessageError::Messages)?;
-		message.double_ack().await.map_err(HandleMessageError::DoubleAck)?;
-		match message.subject.as_str(){
-			"maptest.mapfixes.create"=>self.create_mapfix(from_slice(&message.payload)?).await.map_err(HandleMessageError::CreateMapfix),
-			"maptest.submissions.create"=>self.create_submission(from_slice(&message.payload)?).await.map_err(HandleMessageError::CreateSubmission),
-			"maptest.mapfixes.check"=>self.check_mapfix(from_slice(&message.payload)?).await.map_err(HandleMessageError::CheckMapfix),
-			"maptest.submissions.check"=>self.check_submission(from_slice(&message.payload)?).await.map_err(HandleMessageError::CheckSubmission),
-			"maptest.mapfixes.upload"=>self.upload_mapfix(from_slice(&message.payload)?).await.map_err(HandleMessageError::UploadMapfix),
-			"maptest.submissions.upload"=>self.upload_submission(from_slice(&message.payload)?).await.map_err(HandleMessageError::UploadSubmission),
-			"maptest.mapfixes.validate"=>self.validate_mapfix(from_slice(&message.payload)?).await.map_err(HandleMessageError::ValidateMapfix),
-			"maptest.submissions.validate"=>self.validate_submission(from_slice(&message.payload)?).await.map_err(HandleMessageError::ValidateSubmission),
-			other=>Err(HandleMessageError::UnknownSubject(other.to_owned()))
-		}
-	}
-}

validation/src/nats_types.rs

@@ -6,58 +6,9 @@
 
 #[allow(nonstandard_style)]
 #[derive(serde::Deserialize)]
-pub struct CreateSubmissionRequest{
+pub struct ValidateRequest{
-	// operation_id is passed back in the response message
-	pub OperationID:u32,
-	pub ModelID:u64,
-	pub DisplayName:String,
-	pub Creator:String,
-	pub GameID:u32,
-	// initial status is passed back on create
-	pub Status:u32,
-	pub Roles:u32,
-}
-
-#[allow(nonstandard_style)]
-#[derive(serde::Deserialize)]
-pub struct CreateMapfixRequest{
-	pub OperationID:u32,
-	pub ModelID:u64,
-	pub TargetAssetID:u64,
-	pub Description:String,
-}
-
-#[allow(nonstandard_style)]
-#[derive(serde::Deserialize)]
-pub struct CheckSubmissionRequest{
-	pub SubmissionID:u64,
-	pub ModelID:u64,
-	pub SkipChecks:bool,
-}
-
-#[allow(nonstandard_style)]
-#[derive(serde::Deserialize)]
-pub struct CheckMapfixRequest{
-	pub MapfixID:u64,
-	pub ModelID:u64,
-	pub SkipChecks:bool,
-}
-
-#[allow(nonstandard_style)]
-#[derive(serde::Deserialize)]
-pub struct ValidateSubmissionRequest{
 	// submission_id is passed back in the response message
-	pub SubmissionID:u64,
+	pub SubmissionID:i64,
-	pub ModelID:u64,
-	pub ModelVersion:u64,
-	pub ValidatedModelID:Option<u64>,
-}
-
-#[allow(nonstandard_style)]
-#[derive(serde::Deserialize)]
-pub struct ValidateMapfixRequest{
-	// submission_id is passed back in the response message
-	pub MapfixID:u64,
 	pub ModelID:u64,
 	pub ModelVersion:u64,
 	pub ValidatedModelID:Option<u64>,
@@ -66,17 +17,20 @@ pub struct ValidateMapfixRequest{
 // Create a new map
 #[allow(nonstandard_style)]
 #[derive(serde::Deserialize)]
-pub struct UploadSubmissionRequest{
+pub struct PublishNewRequest{
-	pub SubmissionID:u64,
+	pub SubmissionID:i64,
 	pub ModelID:u64,
 	pub ModelVersion:u64,
-	pub ModelName:String,
+	pub Creator:String,
+	pub DisplayName:String,
+	pub GameID:u32,
+	//games:HashSet<GameID>,
 }
 
 #[allow(nonstandard_style)]
 #[derive(serde::Deserialize)]
-pub struct UploadMapfixRequest{
+pub struct PublishFixRequest{
-	pub MapfixID:u64,
+	pub SubmissionID:i64,
 	pub ModelID:u64,
 	pub ModelVersion:u64,
 	pub TargetAssetID:u64,