releaser: run me to batch release maps

.drone.yml

@@ -25,8 +25,6 @@ steps:
       branch:
         - master
         - staging
-      event:
-        - push
 
   - name: frontend
     image: plugins/docker
@@ -46,8 +44,6 @@ steps:
       branch:
         - master
         - staging
-      event:
-        - push
 
   - name: validator
     image: plugins/docker
@@ -67,16 +63,11 @@ steps:
       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}
+      - echo "Deploy!" # Not going to do actually do this until 
     environment:
       USERNAME:
         from_secret: ARGO_USER
@@ -90,68 +81,8 @@ steps:
       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
+hmac: 9958fd5b01af1ebcc75f7277fe71eb5336b899445c359cecf1b14e83b3d05059
 
 ...

.gitignore

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

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
@@ -14,7 +14,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

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

@@ -30,11 +30,8 @@ services:
       "--pg-password","happypostgresuser",
       # other hosts
       "--nats-host","nats:4222",
-      "--auth-rpc-host","authrpc:8081",
-      "--data-rpc-host","dataservice:9000",
+      "--auth-rpc-host","authrpc:8081"
     ]
-    env_file:
-      - ../auth-compose/strafesnet_staging.env
     depends_on:
       - authrpc
       - nats
@@ -50,20 +47,18 @@ services:
       - maps-service-network
     ports:
       - "3000:3000"
-    environment:
-      - API_HOST=http://submissions:8082/v1
-      - AUTH_HOST=http://localhost:8080/
 
   validation:
     image:
       maps-service-validation
     container_name: validation
     env_file:
-      - ../auth-compose/strafesnet_staging.env
+      - ../auth-compose/strafesnet.env
     environment:
-      - ROBLOX_GROUP_ID=17032139 # "None" is special case string value
-      - API_HOST_INTERNAL=http://submissions:8083/v1
+      - API_HOST=http://submissions:8082
+      - API_HOST_INTERNAL=http://submissions:8083
       - NATS_HOST=nats:4222
+      - DATA_HOST=http://dataservice:9000
     depends_on:
       - nats
       # note: this races the submissions which creates a nats stream
@@ -96,12 +91,11 @@ services:
       - maps-service-network
 
   authrpc:
-    image: registry.itzana.me/strafesnet/auth-service:staging
+    image: registry.itzana.me/strafesnet/auth-service:master
     container_name: authrpc
     command: ["serve", "rpc"]
     environment:
       - REDIS_ADDR=authredis:6379
-      - RBX_GROUP_ID=17032139
     env_file:
       - ../auth-compose/auth-service.env
     depends_on:
@@ -112,7 +106,7 @@ services:
       driver: "none"
 
   auth-web:
-    image: registry.itzana.me/strafesnet/auth-service:staging
+    image: registry.itzana.me/strafesnet/auth-service:master
     command: ["serve", "web"]
     environment:
       - REDIS_ADDR=authredis:6379

generate.go

@@ -1,3 +1,4 @@
 package main
 
 //go:generate go run github.com/ogen-go/ogen/cmd/ogen@latest --target pkg/api --clean openapi.yaml
+//go:generate go run github.com/ogen-go/ogen/cmd/ogen@latest --target pkg/internal --clean openapi-internal.yaml

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-20250724030029-845bea991815/go.mod h1:X7XTRUScRkBWq8q8bplbeso105RPDlnY7J6Wy1IwBMs=
+git.itzana.me/strafesnet/go-grpc v0.0.0-20241129081229-9e166b3d11f7 h1:5XzWd3ZZjSw1M60IfHuILty2vRPBYiqM0FZ+E7uHCi8=
+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=

openapi-internal.yaml

@@ -0,0 +1,103 @@
+openapi: 3.1.0
+info:
+  title: StrafesNET Internal - OpenAPI 3.1
+  description: Internal operations inaccessible from the public internet.
+  version: 0.1.0
+tags:
+  - name: Submissions
+    description: Submission operations
+paths:
+  /submissions/{SubmissionID}/status/validator-validated:
+    post:
+      summary: (Internal endpoint) Role Validator changes status from Validating -> Validated
+      operationId: actionSubmissionValidated
+      tags:
+        - Submissions
+      parameters:
+        - $ref: '#/components/parameters/SubmissionID'
+      responses:
+        "204":
+          description: Successful response
+        default:
+          description: General Error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+  /submissions/{SubmissionID}/status/validator-uploaded:
+    post:
+      summary: (Internal endpoint) Role Validator changes status from Uploading -> Uploaded
+      operationId: actionSubmissionUploaded
+      tags:
+        - Submissions
+      parameters:
+        - $ref: '#/components/parameters/SubmissionID'
+        - name: TargetAssetID
+          in: query
+          schema:
+            type: integer
+            format: int64
+      responses:
+        "204":
+          description: Successful response
+        default:
+          description: General Error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+  /submissions/{SubmissionID}/status/releaser-released:
+    post:
+      summary: (Internal endpoint) Role Releaser changes status from releasing -> released
+      operationId: actionSubmissionReleased
+      tags:
+        - Submissions
+      parameters:
+        - $ref: '#/components/parameters/SubmissionID'
+      responses:
+        "204":
+          description: Successful response
+        default:
+          description: General Error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+components:
+  parameters:
+    SubmissionID:
+      name: SubmissionID
+      in: path
+      required: true
+      description: The unique identifier for a submission.
+      schema:
+        type: integer
+        format: int64
+  schemas:
+    Pagination:
+      type: object
+      required:
+        - Page
+        - Limit
+      properties:
+        Page:
+          type: integer
+          format: int32
+          minimum: 1
+        Limit:
+          type: integer
+          format: int32
+          minimum: 1
+          maximum: 100
+    Error:
+      description: Represents error object
+      type: object
+      properties:
+        code:
+          type: integer
+          format: int64
+        message:
+          type: string
+      required:
+        - code
+        - message

pkg/api/oas_operations_gen.go

@@ -6,60 +6,25 @@ package api
 type OperationName = string
 
 const (
-	ActionMapfixAcceptedOperation                   OperationName = "ActionMapfixAccepted"
-	ActionMapfixRejectOperation                     OperationName = "ActionMapfixReject"
-	ActionMapfixRequestChangesOperation             OperationName = "ActionMapfixRequestChanges"
-	ActionMapfixResetSubmittingOperation            OperationName = "ActionMapfixResetSubmitting"
-	ActionMapfixRetryValidateOperation              OperationName = "ActionMapfixRetryValidate"
-	ActionMapfixRevokeOperation                     OperationName = "ActionMapfixRevoke"
-	ActionMapfixTriggerSubmitOperation              OperationName = "ActionMapfixTriggerSubmit"
-	ActionMapfixTriggerSubmitUncheckedOperation     OperationName = "ActionMapfixTriggerSubmitUnchecked"
-	ActionMapfixTriggerUploadOperation              OperationName = "ActionMapfixTriggerUpload"
-	ActionMapfixTriggerValidateOperation            OperationName = "ActionMapfixTriggerValidate"
-	ActionMapfixValidatedOperation                  OperationName = "ActionMapfixValidated"
-	ActionSubmissionAcceptedOperation               OperationName = "ActionSubmissionAccepted"
-	ActionSubmissionRejectOperation                 OperationName = "ActionSubmissionReject"
-	ActionSubmissionRequestChangesOperation         OperationName = "ActionSubmissionRequestChanges"
-	ActionSubmissionResetSubmittingOperation        OperationName = "ActionSubmissionResetSubmitting"
-	ActionSubmissionRetryValidateOperation          OperationName = "ActionSubmissionRetryValidate"
-	ActionSubmissionRevokeOperation                 OperationName = "ActionSubmissionRevoke"
-	ActionSubmissionTriggerSubmitOperation          OperationName = "ActionSubmissionTriggerSubmit"
-	ActionSubmissionTriggerSubmitUncheckedOperation OperationName = "ActionSubmissionTriggerSubmitUnchecked"
-	ActionSubmissionTriggerUploadOperation          OperationName = "ActionSubmissionTriggerUpload"
-	ActionSubmissionTriggerValidateOperation        OperationName = "ActionSubmissionTriggerValidate"
-	ActionSubmissionValidatedOperation              OperationName = "ActionSubmissionValidated"
-	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"
+	ActionSubmissionRejectOperation          OperationName = "ActionSubmissionReject"
+	ActionSubmissionRequestChangesOperation  OperationName = "ActionSubmissionRequestChanges"
+	ActionSubmissionRevokeOperation          OperationName = "ActionSubmissionRevoke"
+	ActionSubmissionSubmitOperation          OperationName = "ActionSubmissionSubmit"
+	ActionSubmissionTriggerUploadOperation   OperationName = "ActionSubmissionTriggerUpload"
+	ActionSubmissionTriggerValidateOperation OperationName = "ActionSubmissionTriggerValidate"
+	CreateScriptOperation                    OperationName = "CreateScript"
+	CreateScriptPolicyOperation              OperationName = "CreateScriptPolicy"
+	CreateSubmissionOperation                OperationName = "CreateSubmission"
+	DeleteScriptOperation                    OperationName = "DeleteScript"
+	DeleteScriptPolicyOperation              OperationName = "DeleteScriptPolicy"
+	GetScriptOperation                       OperationName = "GetScript"
+	GetScriptPolicyOperation                 OperationName = "GetScriptPolicy"
+	GetScriptPolicyFromHashOperation         OperationName = "GetScriptPolicyFromHash"
+	GetSubmissionOperation                   OperationName = "GetSubmission"
+	ListScriptPolicyOperation                OperationName = "ListScriptPolicy"
+	ListSubmissionsOperation                 OperationName = "ListSubmissions"
+	SetSubmissionCompletedOperation          OperationName = "SetSubmissionCompleted"
+	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,8 +220,8 @@ func (s *Server) decodeCreateSubmissionRequest(r *http.Request) (
 	}
 }
 
-func (s *Server) decodeCreateSubmissionAdminRequest(r *http.Request) (
-	req *SubmissionTriggerCreate,
+func (s *Server) decodeListScriptPolicyRequest(r *http.Request) (
+	req *ListScriptPolicyReq,
 	close func() error,
 	rerr error,
 ) {
@@ -344,13 +231,13 @@ func (s *Server) decodeCreateSubmissionAdminRequest(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"))
@@ -373,7 +260,7 @@ func (s *Server) decodeCreateSubmissionAdminRequest(r *http.Request) (
 
 		d := jx.DecodeBytes(buf)
 
-		var request SubmissionTriggerCreate
+		var request ListScriptPolicyReq
 		if err := func() error {
 			if err := request.Decode(d); err != nil {
 				return err
@@ -404,8 +291,8 @@ func (s *Server) decodeCreateSubmissionAdminRequest(r *http.Request) (
 	}
 }
 
-func (s *Server) decodeCreateSubmissionAuditCommentRequest(r *http.Request) (
-	req CreateSubmissionAuditCommentReq,
+func (s *Server) decodeListSubmissionsRequest(r *http.Request) (
+	req *ListSubmissionsReq,
 	close func() error,
 	rerr error,
 ) {
@@ -415,47 +302,13 @@ func (s *Server) decodeCreateSubmissionAuditCommentRequest(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())
-		}
-	}()
-	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())
+			rerr = multierr.Append(rerr, close())
 		}
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
@@ -478,17 +331,9 @@ func (s *Server) decodeReleaseSubmissionsRequest(r *http.Request) (
 
 		d := jx.DecodeBytes(buf)
 
-		var request []ReleaseInfo
+		var request ListSubmissionsReq
 		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 {
+			if err := request.Decode(d); err != nil {
 				return err
 			}
 			if err := d.Skip(); err != io.EOF {
@@ -504,39 +349,14 @@ func (s *Server) decodeReleaseSubmissionsRequest(r *http.Request) (
 			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}
+			if err := request.Validate(); err != nil {
+				return err
 			}
 			return nil
 		}(); err != nil {
 			return req, close, errors.Wrap(err, "validate")
 		}
-		return request, close, nil
+		return &request, close, nil
 	default:
 		return req, close, validate.InvalidContentType(ct)
 	}
@@ -553,13 +373,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 +444,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 +490,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,8 +53,8 @@ func encodeCreateSubmissionRequest(
 	return nil
 }
 
-func encodeCreateSubmissionAdminRequest(
-	req *SubmissionTriggerCreate,
+func encodeListScriptPolicyRequest(
+	req *ListScriptPolicyReq,
 	r *http.Request,
 ) error {
 	const contentType = "application/json"
@@ -91,28 +67,14 @@ func encodeCreateSubmissionAdminRequest(
 	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,
+func encodeListSubmissionsRequest(
+	req *ListSubmissionsReq,
 	r *http.Request,
 ) error {
 	const contentType = "application/json"
 	e := new(jx.Encoder)
 	{
-		e.ArrStart()
-		for _, elem := range req {
-			elem.Encode(e)
-		}
-		e.ArrEnd()
+		req.Encode(e)
 	}
 	encoded := e.Bytes()
 	ht.SetBody(r, bytes.NewReader(encoded), contentType)

pkg/api/oas_response_encoders_gen.go

@@ -3,7 +3,6 @@
 package api
 
 import (
-	"io"
 	"net/http"
 
 	"github.com/go-faster/errors"
@@ -14,90 +13,6 @@ import (
 	ht "github.com/ogen-go/ogen/http"
 )
 
-func encodeActionMapfixAcceptedResponse(response *ActionMapfixAcceptedNoContent, 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))
-
-	return nil
-}
-
 func encodeActionSubmissionRejectResponse(response *ActionSubmissionRejectNoContent, w http.ResponseWriter, span trace.Span) error {
 	w.WriteHeader(204)
 	span.SetStatus(codes.Ok, http.StatusText(204))
@@ -112,20 +27,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,14 +34,7 @@ func encodeActionSubmissionRevokeResponse(response *ActionSubmissionRevokeNoCont
 	return nil
 }
 
-func encodeActionSubmissionTriggerSubmitResponse(response *ActionSubmissionTriggerSubmitNoContent, 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 encodeActionSubmissionSubmitResponse(response *ActionSubmissionSubmitNoContent, w http.ResponseWriter, span trace.Span) error {
 	w.WriteHeader(204)
 	span.SetStatus(codes.Ok, http.StatusText(204))
 
@@ -161,14 +55,7 @@ func encodeActionSubmissionTriggerValidateResponse(response *ActionSubmissionTri
 	return nil
 }
 
-func encodeActionSubmissionValidatedResponse(response *ActionSubmissionValidatedNoContent, 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 +69,7 @@ func encodeCreateMapfixResponse(response *OperationID, w http.ResponseWriter, sp
 	return nil
 }
 
-func encodeCreateMapfixAuditCommentResponse(response *CreateMapfixAuditCommentNoContent, 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 {
+func encodeCreateScriptPolicyResponse(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))
@@ -203,7 +83,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 +97,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 +111,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 +139,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,56 +167,6 @@ func encodeGetSubmissionResponse(response *Submission, w http.ResponseWriter, sp
 	return nil
 }
 
-func encodeListMapfixAuditEventsResponse(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 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)
@@ -434,7 +185,7 @@ func encodeListScriptPolicyResponse(response []ScriptPolicy, w http.ResponseWrit
 	return nil
 }
 
-func encodeListScriptsResponse(response []Script, 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))
@@ -452,101 +203,6 @@ func encodeListScriptsResponse(response []Script, w http.ResponseWriter, span tr
 	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 +210,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,6 @@ import (
 
 // Handler handles operations described by OpenAPI v3 specification.
 type Handler interface {
-	// ActionMapfixAccepted implements actionMapfixAccepted operation.
-	//
-	// Role Reviewer manually resets validating softlock and changes status from Validating -> Accepted.
-	//
-	// POST /mapfixes/{MapfixID}/status/reset-validating
-	ActionMapfixAccepted(ctx context.Context, params ActionMapfixAcceptedParams) 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,37 +20,18 @@ 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
-	ActionSubmissionTriggerSubmit(ctx context.Context, params ActionSubmissionTriggerSubmitParams) error
-	// ActionSubmissionTriggerSubmitUnchecked implements actionSubmissionTriggerSubmitUnchecked operation.
-	//
-	// Role Reviewer changes status from ChangesRequested -> Submitting.
-	//
-	// POST /submissions/{SubmissionID}/status/trigger-submit-unchecked
-	ActionSubmissionTriggerSubmitUnchecked(ctx context.Context, params ActionSubmissionTriggerSubmitUncheckedParams) error
+	// POST /submissions/{SubmissionID}/status/submit
+	ActionSubmissionSubmit(ctx context.Context, params ActionSubmissionSubmitParams) error
 	// ActionSubmissionTriggerUpload implements actionSubmissionTriggerUpload operation.
 	//
 	// Role Admin changes status from Validated -> Uploading.
@@ -132,58 +40,28 @@ type Handler interface {
 	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.
-	//
-	// Role Admin manually resets uploading softlock and changes status from Uploading -> Validated.
-	//
-	// POST /submissions/{SubmissionID}/status/reset-uploading
-	ActionSubmissionValidated(ctx context.Context, params ActionSubmissionValidatedParams) 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)
-	// 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
+	CreateSubmission(ctx context.Context, req *SubmissionCreate) (*ID, error)
 	// DeleteScript implements deleteScript operation.
 	//
 	// Delete the specified script by ID.
@@ -194,32 +72,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 +84,38 @@ 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)
+	ListScriptPolicy(ctx context.Context, req *ListScriptPolicyReq) ([]ScriptPolicy, error)
 	// ListSubmissions implements listSubmissions operation.
 	//
 	// Get list of submissions.
 	//
 	// GET /submissions
-	ListSubmissions(ctx context.Context, params ListSubmissionsParams) (*Submissions, 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
+	ListSubmissions(ctx context.Context, req *ListSubmissionsReq) ([]Submission, 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 +126,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,115 +13,6 @@ type UnimplementedHandler struct{}
 
 var _ Handler = UnimplementedHandler{}
 
-// ActionMapfixAccepted implements actionMapfixAccepted operation.
-//
-// Role Reviewer manually resets validating softlock and changes status from Validating -> Accepted.
-//
-// POST /mapfixes/{MapfixID}/status/reset-validating
-func (UnimplementedHandler) ActionMapfixAccepted(ctx context.Context, params ActionMapfixAcceptedParams) 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
-}
-
 // ActionSubmissionReject implements actionSubmissionReject operation.
 //
 // Role Reviewer changes status from Submitted -> Rejected.
@@ -140,25 +31,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,21 +40,12 @@ 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
-func (UnimplementedHandler) ActionSubmissionTriggerSubmit(ctx context.Context, params ActionSubmissionTriggerSubmitParams) error {
-	return ht.ErrNotImplemented
-}
-
-// ActionSubmissionTriggerSubmitUnchecked implements actionSubmissionTriggerSubmitUnchecked operation.
-//
-// Role Reviewer changes status from ChangesRequested -> Submitting.
-//
-// POST /submissions/{SubmissionID}/status/trigger-submit-unchecked
-func (UnimplementedHandler) ActionSubmissionTriggerSubmitUnchecked(ctx context.Context, params ActionSubmissionTriggerSubmitUncheckedParams) error {
+// POST /submissions/{SubmissionID}/status/submit
+func (UnimplementedHandler) ActionSubmissionSubmit(ctx context.Context, params ActionSubmissionSubmitParams) error {
 	return ht.ErrNotImplemented
 }
 
@@ -197,46 +60,19 @@ func (UnimplementedHandler) ActionSubmissionTriggerUpload(ctx context.Context, p
 
 // 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.
-//
-// Role Admin manually resets uploading softlock and changes status from Uploading -> Validated.
-//
-// POST /submissions/{SubmissionID}/status/reset-uploading
-func (UnimplementedHandler) ActionSubmissionValidated(ctx context.Context, params ActionSubmissionValidatedParams) 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
-}
-
 // CreateScript implements createScript operation.
 //
 // 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 +81,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 +107,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 +125,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,57 +148,12 @@ 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) {
+func (UnimplementedHandler) ListScriptPolicy(ctx context.Context, req *ListScriptPolicyReq) (r []ScriptPolicy, _ error) {
 	return r, ht.ErrNotImplemented
 }
 
@@ -416,82 +162,19 @@ func (UnimplementedHandler) ListSubmissionAuditEvents(ctx context.Context, param
 // Get list of submissions.
 //
 // GET /submissions
-func (UnimplementedHandler) ListSubmissions(ctx context.Context, params ListSubmissionsParams) (r *Submissions, _ error) {
+func (UnimplementedHandler) ListSubmissions(ctx context.Context, req *ListSubmissionsReq) (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 +188,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/cmds/serve.go

@@ -2,21 +2,14 @@ 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"
+	internal "git.itzana.me/strafesnet/maps-service/pkg/internal"
 	"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"
+	"git.itzana.me/strafesnet/maps-service/pkg/service_internal"
 	"github.com/nats-io/nats.go"
 	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
@@ -84,24 +77,12 @@ func NewServeCommand() *cli.Command {
 				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 +110,35 @@ func serve(ctx *cli.Context) error {
 		log.WithError(err).Fatal("failed to add stream")
 	}
 
-	// connect to main game database
-	conn, err := grpc.Dial(ctx.String("data-rpc-host"), grpc.WithTransportCredentials(insecure.NewCredentials()))
+	svc := &service.Service{
+		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(
-		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{
+	sec := service.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()
+	svc2 := &service_internal.Service{
+		DB:   db,
+		Nats: js,
+	}
 
-	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))
+	srv2, err := internal.NewServer(svc2, nil, internal.WithPathPrefix("/v1"))
 	if err != nil {
-		log.WithField("error", err).Fatalln("failed to net.Listen")
+		log.WithError(err).Fatal("failed to initialize api server")
 	}
-	// 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
+	// idk how else to do this
+	go http.ListenAndServe(fmt.Sprintf(":%d", ctx.Int("port-internal")), srv2)
+	return http.ListenAndServe(fmt.Sprintf(":%d", ctx.Int("port")), srv)
 }

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
-	IfStatusThenUpdateAndGet(ctx context.Context, id int64, statuses []model.SubmissionStatus, values OptionalMap) (model.Submission, error)
+	IfStatusThenUpdate(ctx context.Context, id int64, statuses []model.Status, values OptionalMap) 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)
-	ListWithTotal(ctx context.Context, filters OptionalMap, page model.Page, sort ListSort) (int64, []model.Submission, error)
+	List(ctx context.Context, filters OptionalMap, page model.Page) ([]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 {

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
 }

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 {
-	result := env.db.Model(&model.Submission{}).Where("id = ?", id).Where("status_id IN ?", statuses).Updates(values.Map())
-	if result.Error != nil {
-		if result.Error == gorm.ErrRecordNotFound {
+func (env *Submissions) IfStatusThenUpdate(ctx context.Context, id int64, statuses []model.Status, values datastore.OptionalMap) error {
+	if err := env.db.Model(&model.Submission{}).Where("id = ?", id).Where("status_id IN ?", statuses).Updates(values.Map()).Error; err != nil {
+		if err == gorm.ErrRecordNotFound {
 			return datastore.ErrNotExist
 		}
-		return result.Error
-	}
-
-	if result.RowsAffected == 0 {
-		return datastore.ErroNoRowsAffected
+		return err
 	}
 
 	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
-
-	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 {
+	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
 }
-
-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/internal/oas_cfg_gen.go

@@ -0,0 +1,283 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+import (
+	"net/http"
+
+	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/metric"
+	"go.opentelemetry.io/otel/trace"
+
+	ht "github.com/ogen-go/ogen/http"
+	"github.com/ogen-go/ogen/middleware"
+	"github.com/ogen-go/ogen/ogenerrors"
+	"github.com/ogen-go/ogen/otelogen"
+)
+
+var (
+	// Allocate option closure once.
+	clientSpanKind = trace.WithSpanKind(trace.SpanKindClient)
+	// Allocate option closure once.
+	serverSpanKind = trace.WithSpanKind(trace.SpanKindServer)
+)
+
+type (
+	optionFunc[C any] func(*C)
+	otelOptionFunc    func(*otelConfig)
+)
+
+type otelConfig struct {
+	TracerProvider trace.TracerProvider
+	Tracer         trace.Tracer
+	MeterProvider  metric.MeterProvider
+	Meter          metric.Meter
+}
+
+func (cfg *otelConfig) initOTEL() {
+	if cfg.TracerProvider == nil {
+		cfg.TracerProvider = otel.GetTracerProvider()
+	}
+	if cfg.MeterProvider == nil {
+		cfg.MeterProvider = otel.GetMeterProvider()
+	}
+	cfg.Tracer = cfg.TracerProvider.Tracer(otelogen.Name,
+		trace.WithInstrumentationVersion(otelogen.SemVersion()),
+	)
+	cfg.Meter = cfg.MeterProvider.Meter(otelogen.Name,
+		metric.WithInstrumentationVersion(otelogen.SemVersion()),
+	)
+}
+
+// ErrorHandler is error handler.
+type ErrorHandler = ogenerrors.ErrorHandler
+
+type serverConfig struct {
+	otelConfig
+	NotFound           http.HandlerFunc
+	MethodNotAllowed   func(w http.ResponseWriter, r *http.Request, allowed string)
+	ErrorHandler       ErrorHandler
+	Prefix             string
+	Middleware         Middleware
+	MaxMultipartMemory int64
+}
+
+// ServerOption is server config option.
+type ServerOption interface {
+	applyServer(*serverConfig)
+}
+
+var _ ServerOption = (optionFunc[serverConfig])(nil)
+
+func (o optionFunc[C]) applyServer(c *C) {
+	o(c)
+}
+
+var _ ServerOption = (otelOptionFunc)(nil)
+
+func (o otelOptionFunc) applyServer(c *serverConfig) {
+	o(&c.otelConfig)
+}
+
+func newServerConfig(opts ...ServerOption) serverConfig {
+	cfg := serverConfig{
+		NotFound: http.NotFound,
+		MethodNotAllowed: func(w http.ResponseWriter, r *http.Request, allowed string) {
+			status := http.StatusMethodNotAllowed
+			if r.Method == "OPTIONS" {
+				w.Header().Set("Access-Control-Allow-Methods", allowed)
+				w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
+				status = http.StatusNoContent
+			} else {
+				w.Header().Set("Allow", allowed)
+			}
+			w.WriteHeader(status)
+		},
+		ErrorHandler:       ogenerrors.DefaultErrorHandler,
+		Middleware:         nil,
+		MaxMultipartMemory: 32 << 20, // 32 MB
+	}
+	for _, opt := range opts {
+		opt.applyServer(&cfg)
+	}
+	cfg.initOTEL()
+	return cfg
+}
+
+type baseServer struct {
+	cfg      serverConfig
+	requests metric.Int64Counter
+	errors   metric.Int64Counter
+	duration metric.Float64Histogram
+}
+
+func (s baseServer) notFound(w http.ResponseWriter, r *http.Request) {
+	s.cfg.NotFound(w, r)
+}
+
+func (s baseServer) notAllowed(w http.ResponseWriter, r *http.Request, allowed string) {
+	s.cfg.MethodNotAllowed(w, r, allowed)
+}
+
+func (cfg serverConfig) baseServer() (s baseServer, err error) {
+	s = baseServer{cfg: cfg}
+	if s.requests, err = otelogen.ServerRequestCountCounter(s.cfg.Meter); err != nil {
+		return s, err
+	}
+	if s.errors, err = otelogen.ServerErrorsCountCounter(s.cfg.Meter); err != nil {
+		return s, err
+	}
+	if s.duration, err = otelogen.ServerDurationHistogram(s.cfg.Meter); err != nil {
+		return s, err
+	}
+	return s, nil
+}
+
+type clientConfig struct {
+	otelConfig
+	Client ht.Client
+}
+
+// ClientOption is client config option.
+type ClientOption interface {
+	applyClient(*clientConfig)
+}
+
+var _ ClientOption = (optionFunc[clientConfig])(nil)
+
+func (o optionFunc[C]) applyClient(c *C) {
+	o(c)
+}
+
+var _ ClientOption = (otelOptionFunc)(nil)
+
+func (o otelOptionFunc) applyClient(c *clientConfig) {
+	o(&c.otelConfig)
+}
+
+func newClientConfig(opts ...ClientOption) clientConfig {
+	cfg := clientConfig{
+		Client: http.DefaultClient,
+	}
+	for _, opt := range opts {
+		opt.applyClient(&cfg)
+	}
+	cfg.initOTEL()
+	return cfg
+}
+
+type baseClient struct {
+	cfg      clientConfig
+	requests metric.Int64Counter
+	errors   metric.Int64Counter
+	duration metric.Float64Histogram
+}
+
+func (cfg clientConfig) baseClient() (c baseClient, err error) {
+	c = baseClient{cfg: cfg}
+	if c.requests, err = otelogen.ClientRequestCountCounter(c.cfg.Meter); err != nil {
+		return c, err
+	}
+	if c.errors, err = otelogen.ClientErrorsCountCounter(c.cfg.Meter); err != nil {
+		return c, err
+	}
+	if c.duration, err = otelogen.ClientDurationHistogram(c.cfg.Meter); err != nil {
+		return c, err
+	}
+	return c, nil
+}
+
+// Option is config option.
+type Option interface {
+	ServerOption
+	ClientOption
+}
+
+// WithTracerProvider specifies a tracer provider to use for creating a tracer.
+//
+// If none is specified, the global provider is used.
+func WithTracerProvider(provider trace.TracerProvider) Option {
+	return otelOptionFunc(func(cfg *otelConfig) {
+		if provider != nil {
+			cfg.TracerProvider = provider
+		}
+	})
+}
+
+// WithMeterProvider specifies a meter provider to use for creating a meter.
+//
+// If none is specified, the otel.GetMeterProvider() is used.
+func WithMeterProvider(provider metric.MeterProvider) Option {
+	return otelOptionFunc(func(cfg *otelConfig) {
+		if provider != nil {
+			cfg.MeterProvider = provider
+		}
+	})
+}
+
+// WithClient specifies http client to use.
+func WithClient(client ht.Client) ClientOption {
+	return optionFunc[clientConfig](func(cfg *clientConfig) {
+		if client != nil {
+			cfg.Client = client
+		}
+	})
+}
+
+// WithNotFound specifies Not Found handler to use.
+func WithNotFound(notFound http.HandlerFunc) ServerOption {
+	return optionFunc[serverConfig](func(cfg *serverConfig) {
+		if notFound != nil {
+			cfg.NotFound = notFound
+		}
+	})
+}
+
+// WithMethodNotAllowed specifies Method Not Allowed handler to use.
+func WithMethodNotAllowed(methodNotAllowed func(w http.ResponseWriter, r *http.Request, allowed string)) ServerOption {
+	return optionFunc[serverConfig](func(cfg *serverConfig) {
+		if methodNotAllowed != nil {
+			cfg.MethodNotAllowed = methodNotAllowed
+		}
+	})
+}
+
+// WithErrorHandler specifies error handler to use.
+func WithErrorHandler(h ErrorHandler) ServerOption {
+	return optionFunc[serverConfig](func(cfg *serverConfig) {
+		if h != nil {
+			cfg.ErrorHandler = h
+		}
+	})
+}
+
+// WithPathPrefix specifies server path prefix.
+func WithPathPrefix(prefix string) ServerOption {
+	return optionFunc[serverConfig](func(cfg *serverConfig) {
+		cfg.Prefix = prefix
+	})
+}
+
+// WithMiddleware specifies middlewares to use.
+func WithMiddleware(m ...Middleware) ServerOption {
+	return optionFunc[serverConfig](func(cfg *serverConfig) {
+		switch len(m) {
+		case 0:
+			cfg.Middleware = nil
+		case 1:
+			cfg.Middleware = m[0]
+		default:
+			cfg.Middleware = middleware.ChainMiddlewares(m...)
+		}
+	})
+}
+
+// WithMaxMultipartMemory specifies limit of memory for storing file parts.
+// File parts which can't be stored in memory will be stored on disk in temporary files.
+func WithMaxMultipartMemory(max int64) ServerOption {
+	return optionFunc[serverConfig](func(cfg *serverConfig) {
+		if max > 0 {
+			cfg.MaxMultipartMemory = max
+		}
+	})
+}

pkg/internal/oas_client_gen.go

@@ -0,0 +1,390 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+import (
+	"context"
+	"net/url"
+	"strings"
+	"time"
+
+	"github.com/go-faster/errors"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/codes"
+	"go.opentelemetry.io/otel/metric"
+	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
+	"go.opentelemetry.io/otel/trace"
+
+	"github.com/ogen-go/ogen/conv"
+	ht "github.com/ogen-go/ogen/http"
+	"github.com/ogen-go/ogen/otelogen"
+	"github.com/ogen-go/ogen/uri"
+)
+
+// Invoker invokes operations described by OpenAPI v3 specification.
+type Invoker interface {
+	// ActionSubmissionReleased invokes actionSubmissionReleased operation.
+	//
+	// (Internal endpoint) Role Releaser changes status from releasing -> released.
+	//
+	// POST /submissions/{SubmissionID}/status/releaser-released
+	ActionSubmissionReleased(ctx context.Context, params ActionSubmissionReleasedParams) error
+	// ActionSubmissionUploaded invokes actionSubmissionUploaded operation.
+	//
+	// (Internal endpoint) Role Validator changes status from Uploading -> Uploaded.
+	//
+	// POST /submissions/{SubmissionID}/status/validator-uploaded
+	ActionSubmissionUploaded(ctx context.Context, params ActionSubmissionUploadedParams) error
+	// ActionSubmissionValidated invokes actionSubmissionValidated operation.
+	//
+	// (Internal endpoint) Role Validator changes status from Validating -> Validated.
+	//
+	// POST /submissions/{SubmissionID}/status/validator-validated
+	ActionSubmissionValidated(ctx context.Context, params ActionSubmissionValidatedParams) error
+}
+
+// Client implements OAS client.
+type Client struct {
+	serverURL *url.URL
+	baseClient
+}
+type errorHandler interface {
+	NewError(ctx context.Context, err error) *ErrorStatusCode
+}
+
+var _ Handler = struct {
+	errorHandler
+	*Client
+}{}
+
+func trimTrailingSlashes(u *url.URL) {
+	u.Path = strings.TrimRight(u.Path, "/")
+	u.RawPath = strings.TrimRight(u.RawPath, "/")
+}
+
+// NewClient initializes new Client defined by OAS.
+func NewClient(serverURL string, opts ...ClientOption) (*Client, error) {
+	u, err := url.Parse(serverURL)
+	if err != nil {
+		return nil, err
+	}
+	trimTrailingSlashes(u)
+
+	c, err := newClientConfig(opts...).baseClient()
+	if err != nil {
+		return nil, err
+	}
+	return &Client{
+		serverURL:  u,
+		baseClient: c,
+	}, nil
+}
+
+type serverURLKey struct{}
+
+// WithServerURL sets context key to override server URL.
+func WithServerURL(ctx context.Context, u *url.URL) context.Context {
+	return context.WithValue(ctx, serverURLKey{}, u)
+}
+
+func (c *Client) requestURL(ctx context.Context) *url.URL {
+	u, ok := ctx.Value(serverURLKey{}).(*url.URL)
+	if !ok {
+		return c.serverURL
+	}
+	return u
+}
+
+// ActionSubmissionReleased invokes actionSubmissionReleased operation.
+//
+// (Internal endpoint) Role Releaser changes status from releasing -> released.
+//
+// POST /submissions/{SubmissionID}/status/releaser-released
+func (c *Client) ActionSubmissionReleased(ctx context.Context, params ActionSubmissionReleasedParams) error {
+	_, err := c.sendActionSubmissionReleased(ctx, params)
+	return err
+}
+
+func (c *Client) sendActionSubmissionReleased(ctx context.Context, params ActionSubmissionReleasedParams) (res *ActionSubmissionReleasedNoContent, err error) {
+	otelAttrs := []attribute.KeyValue{
+		otelogen.OperationID("actionSubmissionReleased"),
+		semconv.HTTPRequestMethodKey.String("POST"),
+		semconv.HTTPRouteKey.String("/submissions/{SubmissionID}/status/releaser-released"),
+	}
+
+	// Run stopwatch.
+	startTime := time.Now()
+	defer func() {
+		// Use floating point division here for higher precision (instead of Millisecond method).
+		elapsedDuration := time.Since(startTime)
+		c.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), metric.WithAttributes(otelAttrs...))
+	}()
+
+	// Increment request counter.
+	c.requests.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
+
+	// Start a span for this request.
+	ctx, span := c.cfg.Tracer.Start(ctx, ActionSubmissionReleasedOperation,
+		trace.WithAttributes(otelAttrs...),
+		clientSpanKind,
+	)
+	// Track stage for error reporting.
+	var stage string
+	defer func() {
+		if err != nil {
+			span.RecordError(err)
+			span.SetStatus(codes.Error, stage)
+			c.errors.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
+		}
+		span.End()
+	}()
+
+	stage = "BuildURL"
+	u := uri.Clone(c.requestURL(ctx))
+	var pathParts [3]string
+	pathParts[0] = "/submissions/"
+	{
+		// Encode "SubmissionID" parameter.
+		e := uri.NewPathEncoder(uri.PathEncoderConfig{
+			Param:   "SubmissionID",
+			Style:   uri.PathStyleSimple,
+			Explode: false,
+		})
+		if err := func() error {
+			return e.EncodeValue(conv.Int64ToString(params.SubmissionID))
+		}(); err != nil {
+			return res, errors.Wrap(err, "encode path")
+		}
+		encoded, err := e.Result()
+		if err != nil {
+			return res, errors.Wrap(err, "encode path")
+		}
+		pathParts[1] = encoded
+	}
+	pathParts[2] = "/status/releaser-released"
+	uri.AddPathParts(u, pathParts[:]...)
+
+	stage = "EncodeRequest"
+	r, err := ht.NewRequest(ctx, "POST", u)
+	if err != nil {
+		return res, errors.Wrap(err, "create request")
+	}
+
+	stage = "SendRequest"
+	resp, err := c.cfg.Client.Do(r)
+	if err != nil {
+		return res, errors.Wrap(err, "do request")
+	}
+	defer resp.Body.Close()
+
+	stage = "DecodeResponse"
+	result, err := decodeActionSubmissionReleasedResponse(resp)
+	if err != nil {
+		return res, errors.Wrap(err, "decode response")
+	}
+
+	return result, nil
+}
+
+// ActionSubmissionUploaded invokes actionSubmissionUploaded operation.
+//
+// (Internal endpoint) Role Validator changes status from Uploading -> Uploaded.
+//
+// POST /submissions/{SubmissionID}/status/validator-uploaded
+func (c *Client) ActionSubmissionUploaded(ctx context.Context, params ActionSubmissionUploadedParams) error {
+	_, err := c.sendActionSubmissionUploaded(ctx, params)
+	return err
+}
+
+func (c *Client) sendActionSubmissionUploaded(ctx context.Context, params ActionSubmissionUploadedParams) (res *ActionSubmissionUploadedNoContent, err error) {
+	otelAttrs := []attribute.KeyValue{
+		otelogen.OperationID("actionSubmissionUploaded"),
+		semconv.HTTPRequestMethodKey.String("POST"),
+		semconv.HTTPRouteKey.String("/submissions/{SubmissionID}/status/validator-uploaded"),
+	}
+
+	// Run stopwatch.
+	startTime := time.Now()
+	defer func() {
+		// Use floating point division here for higher precision (instead of Millisecond method).
+		elapsedDuration := time.Since(startTime)
+		c.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), metric.WithAttributes(otelAttrs...))
+	}()
+
+	// Increment request counter.
+	c.requests.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
+
+	// Start a span for this request.
+	ctx, span := c.cfg.Tracer.Start(ctx, ActionSubmissionUploadedOperation,
+		trace.WithAttributes(otelAttrs...),
+		clientSpanKind,
+	)
+	// Track stage for error reporting.
+	var stage string
+	defer func() {
+		if err != nil {
+			span.RecordError(err)
+			span.SetStatus(codes.Error, stage)
+			c.errors.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
+		}
+		span.End()
+	}()
+
+	stage = "BuildURL"
+	u := uri.Clone(c.requestURL(ctx))
+	var pathParts [3]string
+	pathParts[0] = "/submissions/"
+	{
+		// Encode "SubmissionID" parameter.
+		e := uri.NewPathEncoder(uri.PathEncoderConfig{
+			Param:   "SubmissionID",
+			Style:   uri.PathStyleSimple,
+			Explode: false,
+		})
+		if err := func() error {
+			return e.EncodeValue(conv.Int64ToString(params.SubmissionID))
+		}(); err != nil {
+			return res, errors.Wrap(err, "encode path")
+		}
+		encoded, err := e.Result()
+		if err != nil {
+			return res, errors.Wrap(err, "encode path")
+		}
+		pathParts[1] = encoded
+	}
+	pathParts[2] = "/status/validator-uploaded"
+	uri.AddPathParts(u, pathParts[:]...)
+
+	stage = "EncodeQueryParams"
+	q := uri.NewQueryEncoder()
+	{
+		// Encode "TargetAssetID" parameter.
+		cfg := uri.QueryParameterEncodingConfig{
+			Name:    "TargetAssetID",
+			Style:   uri.QueryStyleForm,
+			Explode: true,
+		}
+
+		if err := q.EncodeParam(cfg, func(e uri.Encoder) error {
+			if val, ok := params.TargetAssetID.Get(); ok {
+				return e.EncodeValue(conv.Int64ToString(val))
+			}
+			return nil
+		}); err != nil {
+			return res, errors.Wrap(err, "encode query")
+		}
+	}
+	u.RawQuery = q.Values().Encode()
+
+	stage = "EncodeRequest"
+	r, err := ht.NewRequest(ctx, "POST", u)
+	if err != nil {
+		return res, errors.Wrap(err, "create request")
+	}
+
+	stage = "SendRequest"
+	resp, err := c.cfg.Client.Do(r)
+	if err != nil {
+		return res, errors.Wrap(err, "do request")
+	}
+	defer resp.Body.Close()
+
+	stage = "DecodeResponse"
+	result, err := decodeActionSubmissionUploadedResponse(resp)
+	if err != nil {
+		return res, errors.Wrap(err, "decode response")
+	}
+
+	return result, nil
+}
+
+// ActionSubmissionValidated invokes actionSubmissionValidated operation.
+//
+// (Internal endpoint) Role Validator changes status from Validating -> Validated.
+//
+// POST /submissions/{SubmissionID}/status/validator-validated
+func (c *Client) ActionSubmissionValidated(ctx context.Context, params ActionSubmissionValidatedParams) error {
+	_, err := c.sendActionSubmissionValidated(ctx, params)
+	return err
+}
+
+func (c *Client) sendActionSubmissionValidated(ctx context.Context, params ActionSubmissionValidatedParams) (res *ActionSubmissionValidatedNoContent, err error) {
+	otelAttrs := []attribute.KeyValue{
+		otelogen.OperationID("actionSubmissionValidated"),
+		semconv.HTTPRequestMethodKey.String("POST"),
+		semconv.HTTPRouteKey.String("/submissions/{SubmissionID}/status/validator-validated"),
+	}
+
+	// Run stopwatch.
+	startTime := time.Now()
+	defer func() {
+		// Use floating point division here for higher precision (instead of Millisecond method).
+		elapsedDuration := time.Since(startTime)
+		c.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), metric.WithAttributes(otelAttrs...))
+	}()
+
+	// Increment request counter.
+	c.requests.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
+
+	// Start a span for this request.
+	ctx, span := c.cfg.Tracer.Start(ctx, ActionSubmissionValidatedOperation,
+		trace.WithAttributes(otelAttrs...),
+		clientSpanKind,
+	)
+	// Track stage for error reporting.
+	var stage string
+	defer func() {
+		if err != nil {
+			span.RecordError(err)
+			span.SetStatus(codes.Error, stage)
+			c.errors.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
+		}
+		span.End()
+	}()
+
+	stage = "BuildURL"
+	u := uri.Clone(c.requestURL(ctx))
+	var pathParts [3]string
+	pathParts[0] = "/submissions/"
+	{
+		// Encode "SubmissionID" parameter.
+		e := uri.NewPathEncoder(uri.PathEncoderConfig{
+			Param:   "SubmissionID",
+			Style:   uri.PathStyleSimple,
+			Explode: false,
+		})
+		if err := func() error {
+			return e.EncodeValue(conv.Int64ToString(params.SubmissionID))
+		}(); err != nil {
+			return res, errors.Wrap(err, "encode path")
+		}
+		encoded, err := e.Result()
+		if err != nil {
+			return res, errors.Wrap(err, "encode path")
+		}
+		pathParts[1] = encoded
+	}
+	pathParts[2] = "/status/validator-validated"
+	uri.AddPathParts(u, pathParts[:]...)
+
+	stage = "EncodeRequest"
+	r, err := ht.NewRequest(ctx, "POST", u)
+	if err != nil {
+		return res, errors.Wrap(err, "create request")
+	}
+
+	stage = "SendRequest"
+	resp, err := c.cfg.Client.Do(r)
+	if err != nil {
+		return res, errors.Wrap(err, "do request")
+	}
+	defer resp.Body.Close()
+
+	stage = "DecodeResponse"
+	result, err := decodeActionSubmissionValidatedResponse(resp)
+	if err != nil {
+		return res, errors.Wrap(err, "decode response")
+	}
+
+	return result, nil
+}

pkg/internal/oas_handlers_gen.go

@@ -0,0 +1,482 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	"github.com/go-faster/errors"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/codes"
+	"go.opentelemetry.io/otel/metric"
+	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
+	"go.opentelemetry.io/otel/trace"
+
+	ht "github.com/ogen-go/ogen/http"
+	"github.com/ogen-go/ogen/middleware"
+	"github.com/ogen-go/ogen/ogenerrors"
+	"github.com/ogen-go/ogen/otelogen"
+)
+
+type codeRecorder struct {
+	http.ResponseWriter
+	status int
+}
+
+func (c *codeRecorder) WriteHeader(status int) {
+	c.status = status
+	c.ResponseWriter.WriteHeader(status)
+}
+
+// handleActionSubmissionReleasedRequest handles actionSubmissionReleased operation.
+//
+// (Internal endpoint) Role Releaser changes status from releasing -> released.
+//
+// POST /submissions/{SubmissionID}/status/releaser-released
+func (s *Server) handleActionSubmissionReleasedRequest(args [1]string, argsEscaped bool, w http.ResponseWriter, r *http.Request) {
+	statusWriter := &codeRecorder{ResponseWriter: w}
+	w = statusWriter
+	otelAttrs := []attribute.KeyValue{
+		otelogen.OperationID("actionSubmissionReleased"),
+		semconv.HTTPRequestMethodKey.String("POST"),
+		semconv.HTTPRouteKey.String("/submissions/{SubmissionID}/status/releaser-released"),
+	}
+
+	// Start a span for this request.
+	ctx, span := s.cfg.Tracer.Start(r.Context(), ActionSubmissionReleasedOperation,
+		trace.WithAttributes(otelAttrs...),
+		serverSpanKind,
+	)
+	defer span.End()
+
+	// Add Labeler to context.
+	labeler := &Labeler{attrs: otelAttrs}
+	ctx = contextWithLabeler(ctx, labeler)
+
+	// Run stopwatch.
+	startTime := time.Now()
+	defer func() {
+		elapsedDuration := time.Since(startTime)
+
+		attrSet := labeler.AttributeSet()
+		attrs := attrSet.ToSlice()
+		code := statusWriter.status
+		if code != 0 {
+			codeAttr := semconv.HTTPResponseStatusCode(code)
+			attrs = append(attrs, codeAttr)
+			span.SetAttributes(codeAttr)
+		}
+		attrOpt := metric.WithAttributes(attrs...)
+
+		// Increment request counter.
+		s.requests.Add(ctx, 1, attrOpt)
+
+		// Use floating point division here for higher precision (instead of Millisecond method).
+		s.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), attrOpt)
+	}()
+
+	var (
+		recordError = func(stage string, err error) {
+			span.RecordError(err)
+
+			// https://opentelemetry.io/docs/specs/semconv/http/http-spans/#status
+			// Span Status MUST be left unset if HTTP status code was in the 1xx, 2xx or 3xx ranges,
+			// unless there was another error (e.g., network error receiving the response body; or 3xx codes with
+			// max redirects exceeded), in which case status MUST be set to Error.
+			code := statusWriter.status
+			if code >= 100 && code < 500 {
+				span.SetStatus(codes.Error, stage)
+			}
+
+			attrSet := labeler.AttributeSet()
+			attrs := attrSet.ToSlice()
+			if code != 0 {
+				attrs = append(attrs, semconv.HTTPResponseStatusCode(code))
+			}
+
+			s.errors.Add(ctx, 1, metric.WithAttributes(attrs...))
+		}
+		err          error
+		opErrContext = ogenerrors.OperationContext{
+			Name: ActionSubmissionReleasedOperation,
+			ID:   "actionSubmissionReleased",
+		}
+	)
+	params, err := decodeActionSubmissionReleasedParams(args, argsEscaped, r)
+	if err != nil {
+		err = &ogenerrors.DecodeParamsError{
+			OperationContext: opErrContext,
+			Err:              err,
+		}
+		defer recordError("DecodeParams", err)
+		s.cfg.ErrorHandler(ctx, w, r, err)
+		return
+	}
+
+	var response *ActionSubmissionReleasedNoContent
+	if m := s.cfg.Middleware; m != nil {
+		mreq := middleware.Request{
+			Context:          ctx,
+			OperationName:    ActionSubmissionReleasedOperation,
+			OperationSummary: "(Internal endpoint) Role Releaser changes status from releasing -> released",
+			OperationID:      "actionSubmissionReleased",
+			Body:             nil,
+			Params: middleware.Parameters{
+				{
+					Name: "SubmissionID",
+					In:   "path",
+				}: params.SubmissionID,
+			},
+			Raw: r,
+		}
+
+		type (
+			Request  = struct{}
+			Params   = ActionSubmissionReleasedParams
+			Response = *ActionSubmissionReleasedNoContent
+		)
+		response, err = middleware.HookMiddleware[
+			Request,
+			Params,
+			Response,
+		](
+			m,
+			mreq,
+			unpackActionSubmissionReleasedParams,
+			func(ctx context.Context, request Request, params Params) (response Response, err error) {
+				err = s.h.ActionSubmissionReleased(ctx, params)
+				return response, err
+			},
+		)
+	} else {
+		err = s.h.ActionSubmissionReleased(ctx, params)
+	}
+	if err != nil {
+		if errRes, ok := errors.Into[*ErrorStatusCode](err); ok {
+			if err := encodeErrorResponse(errRes, w, span); err != nil {
+				defer recordError("Internal", err)
+			}
+			return
+		}
+		if errors.Is(err, ht.ErrNotImplemented) {
+			s.cfg.ErrorHandler(ctx, w, r, err)
+			return
+		}
+		if err := encodeErrorResponse(s.h.NewError(ctx, err), w, span); err != nil {
+			defer recordError("Internal", err)
+		}
+		return
+	}
+
+	if err := encodeActionSubmissionReleasedResponse(response, w, span); err != nil {
+		defer recordError("EncodeResponse", err)
+		if !errors.Is(err, ht.ErrInternalServerErrorResponse) {
+			s.cfg.ErrorHandler(ctx, w, r, err)
+		}
+		return
+	}
+}
+
+// handleActionSubmissionUploadedRequest handles actionSubmissionUploaded operation.
+//
+// (Internal endpoint) Role Validator changes status from Uploading -> Uploaded.
+//
+// POST /submissions/{SubmissionID}/status/validator-uploaded
+func (s *Server) handleActionSubmissionUploadedRequest(args [1]string, argsEscaped bool, w http.ResponseWriter, r *http.Request) {
+	statusWriter := &codeRecorder{ResponseWriter: w}
+	w = statusWriter
+	otelAttrs := []attribute.KeyValue{
+		otelogen.OperationID("actionSubmissionUploaded"),
+		semconv.HTTPRequestMethodKey.String("POST"),
+		semconv.HTTPRouteKey.String("/submissions/{SubmissionID}/status/validator-uploaded"),
+	}
+
+	// Start a span for this request.
+	ctx, span := s.cfg.Tracer.Start(r.Context(), ActionSubmissionUploadedOperation,
+		trace.WithAttributes(otelAttrs...),
+		serverSpanKind,
+	)
+	defer span.End()
+
+	// Add Labeler to context.
+	labeler := &Labeler{attrs: otelAttrs}
+	ctx = contextWithLabeler(ctx, labeler)
+
+	// Run stopwatch.
+	startTime := time.Now()
+	defer func() {
+		elapsedDuration := time.Since(startTime)
+
+		attrSet := labeler.AttributeSet()
+		attrs := attrSet.ToSlice()
+		code := statusWriter.status
+		if code != 0 {
+			codeAttr := semconv.HTTPResponseStatusCode(code)
+			attrs = append(attrs, codeAttr)
+			span.SetAttributes(codeAttr)
+		}
+		attrOpt := metric.WithAttributes(attrs...)
+
+		// Increment request counter.
+		s.requests.Add(ctx, 1, attrOpt)
+
+		// Use floating point division here for higher precision (instead of Millisecond method).
+		s.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), attrOpt)
+	}()
+
+	var (
+		recordError = func(stage string, err error) {
+			span.RecordError(err)
+
+			// https://opentelemetry.io/docs/specs/semconv/http/http-spans/#status
+			// Span Status MUST be left unset if HTTP status code was in the 1xx, 2xx or 3xx ranges,
+			// unless there was another error (e.g., network error receiving the response body; or 3xx codes with
+			// max redirects exceeded), in which case status MUST be set to Error.
+			code := statusWriter.status
+			if code >= 100 && code < 500 {
+				span.SetStatus(codes.Error, stage)
+			}
+
+			attrSet := labeler.AttributeSet()
+			attrs := attrSet.ToSlice()
+			if code != 0 {
+				attrs = append(attrs, semconv.HTTPResponseStatusCode(code))
+			}
+
+			s.errors.Add(ctx, 1, metric.WithAttributes(attrs...))
+		}
+		err          error
+		opErrContext = ogenerrors.OperationContext{
+			Name: ActionSubmissionUploadedOperation,
+			ID:   "actionSubmissionUploaded",
+		}
+	)
+	params, err := decodeActionSubmissionUploadedParams(args, argsEscaped, r)
+	if err != nil {
+		err = &ogenerrors.DecodeParamsError{
+			OperationContext: opErrContext,
+			Err:              err,
+		}
+		defer recordError("DecodeParams", err)
+		s.cfg.ErrorHandler(ctx, w, r, err)
+		return
+	}
+
+	var response *ActionSubmissionUploadedNoContent
+	if m := s.cfg.Middleware; m != nil {
+		mreq := middleware.Request{
+			Context:          ctx,
+			OperationName:    ActionSubmissionUploadedOperation,
+			OperationSummary: "(Internal endpoint) Role Validator changes status from Uploading -> Uploaded",
+			OperationID:      "actionSubmissionUploaded",
+			Body:             nil,
+			Params: middleware.Parameters{
+				{
+					Name: "SubmissionID",
+					In:   "path",
+				}: params.SubmissionID,
+				{
+					Name: "TargetAssetID",
+					In:   "query",
+				}: params.TargetAssetID,
+			},
+			Raw: r,
+		}
+
+		type (
+			Request  = struct{}
+			Params   = ActionSubmissionUploadedParams
+			Response = *ActionSubmissionUploadedNoContent
+		)
+		response, err = middleware.HookMiddleware[
+			Request,
+			Params,
+			Response,
+		](
+			m,
+			mreq,
+			unpackActionSubmissionUploadedParams,
+			func(ctx context.Context, request Request, params Params) (response Response, err error) {
+				err = s.h.ActionSubmissionUploaded(ctx, params)
+				return response, err
+			},
+		)
+	} else {
+		err = s.h.ActionSubmissionUploaded(ctx, params)
+	}
+	if err != nil {
+		if errRes, ok := errors.Into[*ErrorStatusCode](err); ok {
+			if err := encodeErrorResponse(errRes, w, span); err != nil {
+				defer recordError("Internal", err)
+			}
+			return
+		}
+		if errors.Is(err, ht.ErrNotImplemented) {
+			s.cfg.ErrorHandler(ctx, w, r, err)
+			return
+		}
+		if err := encodeErrorResponse(s.h.NewError(ctx, err), w, span); err != nil {
+			defer recordError("Internal", err)
+		}
+		return
+	}
+
+	if err := encodeActionSubmissionUploadedResponse(response, w, span); err != nil {
+		defer recordError("EncodeResponse", err)
+		if !errors.Is(err, ht.ErrInternalServerErrorResponse) {
+			s.cfg.ErrorHandler(ctx, w, r, err)
+		}
+		return
+	}
+}
+
+// handleActionSubmissionValidatedRequest handles actionSubmissionValidated operation.
+//
+// (Internal endpoint) Role Validator changes status from Validating -> Validated.
+//
+// POST /submissions/{SubmissionID}/status/validator-validated
+func (s *Server) handleActionSubmissionValidatedRequest(args [1]string, argsEscaped bool, w http.ResponseWriter, r *http.Request) {
+	statusWriter := &codeRecorder{ResponseWriter: w}
+	w = statusWriter
+	otelAttrs := []attribute.KeyValue{
+		otelogen.OperationID("actionSubmissionValidated"),
+		semconv.HTTPRequestMethodKey.String("POST"),
+		semconv.HTTPRouteKey.String("/submissions/{SubmissionID}/status/validator-validated"),
+	}
+
+	// Start a span for this request.
+	ctx, span := s.cfg.Tracer.Start(r.Context(), ActionSubmissionValidatedOperation,
+		trace.WithAttributes(otelAttrs...),
+		serverSpanKind,
+	)
+	defer span.End()
+
+	// Add Labeler to context.
+	labeler := &Labeler{attrs: otelAttrs}
+	ctx = contextWithLabeler(ctx, labeler)
+
+	// Run stopwatch.
+	startTime := time.Now()
+	defer func() {
+		elapsedDuration := time.Since(startTime)
+
+		attrSet := labeler.AttributeSet()
+		attrs := attrSet.ToSlice()
+		code := statusWriter.status
+		if code != 0 {
+			codeAttr := semconv.HTTPResponseStatusCode(code)
+			attrs = append(attrs, codeAttr)
+			span.SetAttributes(codeAttr)
+		}
+		attrOpt := metric.WithAttributes(attrs...)
+
+		// Increment request counter.
+		s.requests.Add(ctx, 1, attrOpt)
+
+		// Use floating point division here for higher precision (instead of Millisecond method).
+		s.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), attrOpt)
+	}()
+
+	var (
+		recordError = func(stage string, err error) {
+			span.RecordError(err)
+
+			// https://opentelemetry.io/docs/specs/semconv/http/http-spans/#status
+			// Span Status MUST be left unset if HTTP status code was in the 1xx, 2xx or 3xx ranges,
+			// unless there was another error (e.g., network error receiving the response body; or 3xx codes with
+			// max redirects exceeded), in which case status MUST be set to Error.
+			code := statusWriter.status
+			if code >= 100 && code < 500 {
+				span.SetStatus(codes.Error, stage)
+			}
+
+			attrSet := labeler.AttributeSet()
+			attrs := attrSet.ToSlice()
+			if code != 0 {
+				attrs = append(attrs, semconv.HTTPResponseStatusCode(code))
+			}
+
+			s.errors.Add(ctx, 1, metric.WithAttributes(attrs...))
+		}
+		err          error
+		opErrContext = ogenerrors.OperationContext{
+			Name: ActionSubmissionValidatedOperation,
+			ID:   "actionSubmissionValidated",
+		}
+	)
+	params, err := decodeActionSubmissionValidatedParams(args, argsEscaped, r)
+	if err != nil {
+		err = &ogenerrors.DecodeParamsError{
+			OperationContext: opErrContext,
+			Err:              err,
+		}
+		defer recordError("DecodeParams", err)
+		s.cfg.ErrorHandler(ctx, w, r, err)
+		return
+	}
+
+	var response *ActionSubmissionValidatedNoContent
+	if m := s.cfg.Middleware; m != nil {
+		mreq := middleware.Request{
+			Context:          ctx,
+			OperationName:    ActionSubmissionValidatedOperation,
+			OperationSummary: "(Internal endpoint) Role Validator changes status from Validating -> Validated",
+			OperationID:      "actionSubmissionValidated",
+			Body:             nil,
+			Params: middleware.Parameters{
+				{
+					Name: "SubmissionID",
+					In:   "path",
+				}: params.SubmissionID,
+			},
+			Raw: r,
+		}
+
+		type (
+			Request  = struct{}
+			Params   = ActionSubmissionValidatedParams
+			Response = *ActionSubmissionValidatedNoContent
+		)
+		response, err = middleware.HookMiddleware[
+			Request,
+			Params,
+			Response,
+		](
+			m,
+			mreq,
+			unpackActionSubmissionValidatedParams,
+			func(ctx context.Context, request Request, params Params) (response Response, err error) {
+				err = s.h.ActionSubmissionValidated(ctx, params)
+				return response, err
+			},
+		)
+	} else {
+		err = s.h.ActionSubmissionValidated(ctx, params)
+	}
+	if err != nil {
+		if errRes, ok := errors.Into[*ErrorStatusCode](err); ok {
+			if err := encodeErrorResponse(errRes, w, span); err != nil {
+				defer recordError("Internal", err)
+			}
+			return
+		}
+		if errors.Is(err, ht.ErrNotImplemented) {
+			s.cfg.ErrorHandler(ctx, w, r, err)
+			return
+		}
+		if err := encodeErrorResponse(s.h.NewError(ctx, err), w, span); err != nil {
+			defer recordError("Internal", err)
+		}
+		return
+	}
+
+	if err := encodeActionSubmissionValidatedResponse(response, w, span); err != nil {
+		defer recordError("EncodeResponse", err)
+		if !errors.Is(err, ht.ErrInternalServerErrorResponse) {
+			s.cfg.ErrorHandler(ctx, w, r, err)
+		}
+		return
+	}
+}

pkg/internal/oas_json_gen.go

@@ -0,0 +1,126 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+import (
+	"math/bits"
+	"strconv"
+
+	"github.com/go-faster/errors"
+	"github.com/go-faster/jx"
+
+	"github.com/ogen-go/ogen/validate"
+)
+
+// Encode implements json.Marshaler.
+func (s *Error) Encode(e *jx.Encoder) {
+	e.ObjStart()
+	s.encodeFields(e)
+	e.ObjEnd()
+}
+
+// encodeFields encodes fields.
+func (s *Error) encodeFields(e *jx.Encoder) {
+	{
+		e.FieldStart("code")
+		e.Int64(s.Code)
+	}
+	{
+		e.FieldStart("message")
+		e.Str(s.Message)
+	}
+}
+
+var jsonFieldsNameOfError = [2]string{
+	0: "code",
+	1: "message",
+}
+
+// Decode decodes Error from json.
+func (s *Error) Decode(d *jx.Decoder) error {
+	if s == nil {
+		return errors.New("invalid: unable to decode Error to nil")
+	}
+	var requiredBitSet [1]uint8
+
+	if err := d.ObjBytes(func(d *jx.Decoder, k []byte) error {
+		switch string(k) {
+		case "code":
+			requiredBitSet[0] |= 1 << 0
+			if err := func() error {
+				v, err := d.Int64()
+				s.Code = int64(v)
+				if err != nil {
+					return err
+				}
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"code\"")
+			}
+		case "message":
+			requiredBitSet[0] |= 1 << 1
+			if err := func() error {
+				v, err := d.Str()
+				s.Message = string(v)
+				if err != nil {
+					return err
+				}
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"message\"")
+			}
+		default:
+			return d.Skip()
+		}
+		return nil
+	}); err != nil {
+		return errors.Wrap(err, "decode Error")
+	}
+	// 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(jsonFieldsNameOfError) {
+					name = jsonFieldsNameOfError[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
+}
+
+// MarshalJSON implements stdjson.Marshaler.
+func (s *Error) MarshalJSON() ([]byte, error) {
+	e := jx.Encoder{}
+	s.Encode(&e)
+	return e.Bytes(), nil
+}
+
+// UnmarshalJSON implements stdjson.Unmarshaler.
+func (s *Error) UnmarshalJSON(data []byte) error {
+	d := jx.DecodeBytes(data)
+	return s.Decode(d)
+}

pkg/internal/oas_labeler_gen.go

@@ -0,0 +1,42 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+import (
+	"context"
+
+	"go.opentelemetry.io/otel/attribute"
+)
+
+// Labeler is used to allow adding custom attributes to the server request metrics.
+type Labeler struct {
+	attrs []attribute.KeyValue
+}
+
+// Add attributes to the Labeler.
+func (l *Labeler) Add(attrs ...attribute.KeyValue) {
+	l.attrs = append(l.attrs, attrs...)
+}
+
+// AttributeSet returns the attributes added to the Labeler as an attribute.Set.
+func (l *Labeler) AttributeSet() attribute.Set {
+	return attribute.NewSet(l.attrs...)
+}
+
+type labelerContextKey struct{}
+
+// LabelerFromContext retrieves the Labeler from the provided context, if present.
+//
+// If no Labeler was found in the provided context a new, empty Labeler is returned and the second
+// return value is false. In this case it is safe to use the Labeler but any attributes added to
+// it will not be used.
+func LabelerFromContext(ctx context.Context) (*Labeler, bool) {
+	if l, ok := ctx.Value(labelerContextKey{}).(*Labeler); ok {
+		return l, true
+	}
+	return &Labeler{}, false
+}
+
+func contextWithLabeler(ctx context.Context, l *Labeler) context.Context {
+	return context.WithValue(ctx, labelerContextKey{}, l)
+}

pkg/internal/oas_middleware_gen.go

@@ -0,0 +1,10 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+import (
+	"github.com/ogen-go/ogen/middleware"
+)
+
+// Middleware is middleware type.
+type Middleware = middleware.Middleware

pkg/internal/oas_operations_gen.go

@@ -0,0 +1,12 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+// OperationName is the ogen operation name
+type OperationName = string
+
+const (
+	ActionSubmissionReleasedOperation  OperationName = "ActionSubmissionReleased"
+	ActionSubmissionUploadedOperation  OperationName = "ActionSubmissionUploaded"
+	ActionSubmissionValidatedOperation OperationName = "ActionSubmissionValidated"
+)

pkg/internal/oas_parameters_gen.go

@@ -0,0 +1,266 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+import (
+	"net/http"
+	"net/url"
+
+	"github.com/go-faster/errors"
+
+	"github.com/ogen-go/ogen/conv"
+	"github.com/ogen-go/ogen/middleware"
+	"github.com/ogen-go/ogen/ogenerrors"
+	"github.com/ogen-go/ogen/uri"
+	"github.com/ogen-go/ogen/validate"
+)
+
+// ActionSubmissionReleasedParams is parameters of actionSubmissionReleased operation.
+type ActionSubmissionReleasedParams struct {
+	// The unique identifier for a submission.
+	SubmissionID int64
+}
+
+func unpackActionSubmissionReleasedParams(packed middleware.Parameters) (params ActionSubmissionReleasedParams) {
+	{
+		key := middleware.ParameterKey{
+			Name: "SubmissionID",
+			In:   "path",
+		}
+		params.SubmissionID = packed[key].(int64)
+	}
+	return params
+}
+
+func decodeActionSubmissionReleasedParams(args [1]string, argsEscaped bool, r *http.Request) (params ActionSubmissionReleasedParams, _ error) {
+	// Decode path: SubmissionID.
+	if err := func() error {
+		param := args[0]
+		if argsEscaped {
+			unescaped, err := url.PathUnescape(args[0])
+			if err != nil {
+				return errors.Wrap(err, "unescape path")
+			}
+			param = unescaped
+		}
+		if len(param) > 0 {
+			d := uri.NewPathDecoder(uri.PathDecoderConfig{
+				Param:   "SubmissionID",
+				Value:   param,
+				Style:   uri.PathStyleSimple,
+				Explode: false,
+			})
+
+			if err := func() error {
+				val, err := d.DecodeValue()
+				if err != nil {
+					return err
+				}
+
+				c, err := conv.ToInt64(val)
+				if err != nil {
+					return err
+				}
+
+				params.SubmissionID = c
+				return nil
+			}(); err != nil {
+				return err
+			}
+		} else {
+			return validate.ErrFieldRequired
+		}
+		return nil
+	}(); err != nil {
+		return params, &ogenerrors.DecodeParamError{
+			Name: "SubmissionID",
+			In:   "path",
+			Err:  err,
+		}
+	}
+	return params, nil
+}
+
+// ActionSubmissionUploadedParams is parameters of actionSubmissionUploaded operation.
+type ActionSubmissionUploadedParams struct {
+	// The unique identifier for a submission.
+	SubmissionID  int64
+	TargetAssetID OptInt64
+}
+
+func unpackActionSubmissionUploadedParams(packed middleware.Parameters) (params ActionSubmissionUploadedParams) {
+	{
+		key := middleware.ParameterKey{
+			Name: "SubmissionID",
+			In:   "path",
+		}
+		params.SubmissionID = packed[key].(int64)
+	}
+	{
+		key := middleware.ParameterKey{
+			Name: "TargetAssetID",
+			In:   "query",
+		}
+		if v, ok := packed[key]; ok {
+			params.TargetAssetID = v.(OptInt64)
+		}
+	}
+	return params
+}
+
+func decodeActionSubmissionUploadedParams(args [1]string, argsEscaped bool, r *http.Request) (params ActionSubmissionUploadedParams, _ error) {
+	q := uri.NewQueryDecoder(r.URL.Query())
+	// Decode path: SubmissionID.
+	if err := func() error {
+		param := args[0]
+		if argsEscaped {
+			unescaped, err := url.PathUnescape(args[0])
+			if err != nil {
+				return errors.Wrap(err, "unescape path")
+			}
+			param = unescaped
+		}
+		if len(param) > 0 {
+			d := uri.NewPathDecoder(uri.PathDecoderConfig{
+				Param:   "SubmissionID",
+				Value:   param,
+				Style:   uri.PathStyleSimple,
+				Explode: false,
+			})
+
+			if err := func() error {
+				val, err := d.DecodeValue()
+				if err != nil {
+					return err
+				}
+
+				c, err := conv.ToInt64(val)
+				if err != nil {
+					return err
+				}
+
+				params.SubmissionID = c
+				return nil
+			}(); err != nil {
+				return err
+			}
+		} else {
+			return validate.ErrFieldRequired
+		}
+		return nil
+	}(); err != nil {
+		return params, &ogenerrors.DecodeParamError{
+			Name: "SubmissionID",
+			In:   "path",
+			Err:  err,
+		}
+	}
+	// Decode query: TargetAssetID.
+	if err := func() error {
+		cfg := uri.QueryParameterDecodingConfig{
+			Name:    "TargetAssetID",
+			Style:   uri.QueryStyleForm,
+			Explode: true,
+		}
+
+		if err := q.HasParam(cfg); err == nil {
+			if err := q.DecodeParam(cfg, func(d uri.Decoder) error {
+				var paramsDotTargetAssetIDVal int64
+				if err := func() error {
+					val, err := d.DecodeValue()
+					if err != nil {
+						return err
+					}
+
+					c, err := conv.ToInt64(val)
+					if err != nil {
+						return err
+					}
+
+					paramsDotTargetAssetIDVal = c
+					return nil
+				}(); err != nil {
+					return err
+				}
+				params.TargetAssetID.SetTo(paramsDotTargetAssetIDVal)
+				return nil
+			}); err != nil {
+				return err
+			}
+		}
+		return nil
+	}(); err != nil {
+		return params, &ogenerrors.DecodeParamError{
+			Name: "TargetAssetID",
+			In:   "query",
+			Err:  err,
+		}
+	}
+	return params, nil
+}
+
+// ActionSubmissionValidatedParams is parameters of actionSubmissionValidated operation.
+type ActionSubmissionValidatedParams struct {
+	// The unique identifier for a submission.
+	SubmissionID int64
+}
+
+func unpackActionSubmissionValidatedParams(packed middleware.Parameters) (params ActionSubmissionValidatedParams) {
+	{
+		key := middleware.ParameterKey{
+			Name: "SubmissionID",
+			In:   "path",
+		}
+		params.SubmissionID = packed[key].(int64)
+	}
+	return params
+}
+
+func decodeActionSubmissionValidatedParams(args [1]string, argsEscaped bool, r *http.Request) (params ActionSubmissionValidatedParams, _ error) {
+	// Decode path: SubmissionID.
+	if err := func() error {
+		param := args[0]
+		if argsEscaped {
+			unescaped, err := url.PathUnescape(args[0])
+			if err != nil {
+				return errors.Wrap(err, "unescape path")
+			}
+			param = unescaped
+		}
+		if len(param) > 0 {
+			d := uri.NewPathDecoder(uri.PathDecoderConfig{
+				Param:   "SubmissionID",
+				Value:   param,
+				Style:   uri.PathStyleSimple,
+				Explode: false,
+			})
+
+			if err := func() error {
+				val, err := d.DecodeValue()
+				if err != nil {
+					return err
+				}
+
+				c, err := conv.ToInt64(val)
+				if err != nil {
+					return err
+				}
+
+				params.SubmissionID = c
+				return nil
+			}(); err != nil {
+				return err
+			}
+		} else {
+			return validate.ErrFieldRequired
+		}
+		return nil
+	}(); err != nil {
+		return params, &ogenerrors.DecodeParamError{
+			Name: "SubmissionID",
+			In:   "path",
+			Err:  err,
+		}
+	}
+	return params, nil
+}

pkg/internal/oas_request_decoders_gen.go

@@ -0,0 +1,3 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api

pkg/internal/oas_request_encoders_gen.go

@@ -0,0 +1,3 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api

pkg/internal/oas_response_decoders_gen.go

@@ -0,0 +1,168 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+import (
+	"io"
+	"mime"
+	"net/http"
+
+	"github.com/go-faster/errors"
+	"github.com/go-faster/jx"
+
+	"github.com/ogen-go/ogen/ogenerrors"
+	"github.com/ogen-go/ogen/validate"
+)
+
+func decodeActionSubmissionReleasedResponse(resp *http.Response) (res *ActionSubmissionReleasedNoContent, _ error) {
+	switch resp.StatusCode {
+	case 204:
+		// Code 204.
+		return &ActionSubmissionReleasedNoContent{}, nil
+	}
+	// Convenient error response.
+	defRes, err := func() (res *ErrorStatusCode, err error) {
+		ct, _, err := mime.ParseMediaType(resp.Header.Get("Content-Type"))
+		if err != nil {
+			return res, errors.Wrap(err, "parse media type")
+		}
+		switch {
+		case ct == "application/json":
+			buf, err := io.ReadAll(resp.Body)
+			if err != nil {
+				return res, err
+			}
+			d := jx.DecodeBytes(buf)
+
+			var response Error
+			if err := func() error {
+				if err := response.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 res, err
+			}
+			return &ErrorStatusCode{
+				StatusCode: resp.StatusCode,
+				Response:   response,
+			}, nil
+		default:
+			return res, validate.InvalidContentType(ct)
+		}
+	}()
+	if err != nil {
+		return res, errors.Wrapf(err, "default (code %d)", resp.StatusCode)
+	}
+	return res, errors.Wrap(defRes, "error")
+}
+
+func decodeActionSubmissionUploadedResponse(resp *http.Response) (res *ActionSubmissionUploadedNoContent, _ error) {
+	switch resp.StatusCode {
+	case 204:
+		// Code 204.
+		return &ActionSubmissionUploadedNoContent{}, nil
+	}
+	// Convenient error response.
+	defRes, err := func() (res *ErrorStatusCode, err error) {
+		ct, _, err := mime.ParseMediaType(resp.Header.Get("Content-Type"))
+		if err != nil {
+			return res, errors.Wrap(err, "parse media type")
+		}
+		switch {
+		case ct == "application/json":
+			buf, err := io.ReadAll(resp.Body)
+			if err != nil {
+				return res, err
+			}
+			d := jx.DecodeBytes(buf)
+
+			var response Error
+			if err := func() error {
+				if err := response.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 res, err
+			}
+			return &ErrorStatusCode{
+				StatusCode: resp.StatusCode,
+				Response:   response,
+			}, nil
+		default:
+			return res, validate.InvalidContentType(ct)
+		}
+	}()
+	if err != nil {
+		return res, errors.Wrapf(err, "default (code %d)", resp.StatusCode)
+	}
+	return res, errors.Wrap(defRes, "error")
+}
+
+func decodeActionSubmissionValidatedResponse(resp *http.Response) (res *ActionSubmissionValidatedNoContent, _ error) {
+	switch resp.StatusCode {
+	case 204:
+		// Code 204.
+		return &ActionSubmissionValidatedNoContent{}, nil
+	}
+	// Convenient error response.
+	defRes, err := func() (res *ErrorStatusCode, err error) {
+		ct, _, err := mime.ParseMediaType(resp.Header.Get("Content-Type"))
+		if err != nil {
+			return res, errors.Wrap(err, "parse media type")
+		}
+		switch {
+		case ct == "application/json":
+			buf, err := io.ReadAll(resp.Body)
+			if err != nil {
+				return res, err
+			}
+			d := jx.DecodeBytes(buf)
+
+			var response Error
+			if err := func() error {
+				if err := response.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 res, err
+			}
+			return &ErrorStatusCode{
+				StatusCode: resp.StatusCode,
+				Response:   response,
+			}, nil
+		default:
+			return res, validate.InvalidContentType(ct)
+		}
+	}()
+	if err != nil {
+		return res, errors.Wrapf(err, "default (code %d)", resp.StatusCode)
+	}
+	return res, errors.Wrap(defRes, "error")
+}

pkg/internal/oas_response_encoders_gen.go

@@ -0,0 +1,62 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+import (
+	"net/http"
+
+	"github.com/go-faster/errors"
+	"github.com/go-faster/jx"
+	"go.opentelemetry.io/otel/codes"
+	"go.opentelemetry.io/otel/trace"
+
+	ht "github.com/ogen-go/ogen/http"
+)
+
+func encodeActionSubmissionReleasedResponse(response *ActionSubmissionReleasedNoContent, w http.ResponseWriter, span trace.Span) error {
+	w.WriteHeader(204)
+	span.SetStatus(codes.Ok, http.StatusText(204))
+
+	return nil
+}
+
+func encodeActionSubmissionUploadedResponse(response *ActionSubmissionUploadedNoContent, w http.ResponseWriter, span trace.Span) error {
+	w.WriteHeader(204)
+	span.SetStatus(codes.Ok, http.StatusText(204))
+
+	return nil
+}
+
+func encodeActionSubmissionValidatedResponse(response *ActionSubmissionValidatedNoContent, w http.ResponseWriter, span trace.Span) error {
+	w.WriteHeader(204)
+	span.SetStatus(codes.Ok, http.StatusText(204))
+
+	return nil
+}
+
+func encodeErrorResponse(response *ErrorStatusCode, w http.ResponseWriter, span trace.Span) error {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	code := response.StatusCode
+	if code == 0 {
+		// Set default status code.
+		code = http.StatusOK
+	}
+	w.WriteHeader(code)
+	if st := http.StatusText(code); code >= http.StatusBadRequest {
+		span.SetStatus(codes.Error, st)
+	} else {
+		span.SetStatus(codes.Ok, st)
+	}
+
+	e := new(jx.Encoder)
+	response.Response.Encode(e)
+	if _, err := e.WriteTo(w); err != nil {
+		return errors.Wrap(err, "write")
+	}
+
+	if code >= http.StatusInternalServerError {
+		return errors.Wrapf(ht.ErrInternalServerErrorResponse, "code: %d, message: %s", code, http.StatusText(code))
+	}
+	return nil
+
+}

pkg/internal/oas_router_gen.go

@@ -0,0 +1,387 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+import (
+	"net/http"
+	"net/url"
+	"strings"
+
+	"github.com/ogen-go/ogen/uri"
+)
+
+func (s *Server) cutPrefix(path string) (string, bool) {
+	prefix := s.cfg.Prefix
+	if prefix == "" {
+		return path, true
+	}
+	if !strings.HasPrefix(path, prefix) {
+		// Prefix doesn't match.
+		return "", false
+	}
+	// Cut prefix from the path.
+	return strings.TrimPrefix(path, prefix), true
+}
+
+// ServeHTTP serves http request as defined by OpenAPI v3 specification,
+// calling handler that matches the path or returning not found error.
+func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	elem := r.URL.Path
+	elemIsEscaped := false
+	if rawPath := r.URL.RawPath; rawPath != "" {
+		if normalized, ok := uri.NormalizeEscapedPath(rawPath); ok {
+			elem = normalized
+			elemIsEscaped = strings.ContainsRune(elem, '%')
+		}
+	}
+
+	elem, ok := s.cutPrefix(elem)
+	if !ok || len(elem) == 0 {
+		s.notFound(w, r)
+		return
+	}
+	args := [1]string{}
+
+	// Static code generated router with unwrapped path search.
+	switch {
+	default:
+		if len(elem) == 0 {
+			break
+		}
+		switch elem[0] {
+		case '/': // Prefix: "/submissions/"
+			origElem := elem
+			if l := len("/submissions/"); len(elem) >= l && elem[0:l] == "/submissions/" {
+				elem = elem[l:]
+			} else {
+				break
+			}
+
+			// Param: "SubmissionID"
+			// Match until "/"
+			idx := strings.IndexByte(elem, '/')
+			if idx < 0 {
+				idx = len(elem)
+			}
+			args[0] = elem[:idx]
+			elem = elem[idx:]
+
+			if len(elem) == 0 {
+				break
+			}
+			switch elem[0] {
+			case '/': // Prefix: "/status/"
+				origElem := elem
+				if l := len("/status/"); len(elem) >= l && elem[0:l] == "/status/" {
+					elem = elem[l:]
+				} else {
+					break
+				}
+
+				if len(elem) == 0 {
+					break
+				}
+				switch elem[0] {
+				case 'r': // Prefix: "releaser-released"
+					origElem := elem
+					if l := len("releaser-released"); len(elem) >= l && elem[0:l] == "releaser-released" {
+						elem = elem[l:]
+					} else {
+						break
+					}
+
+					if len(elem) == 0 {
+						// Leaf node.
+						switch r.Method {
+						case "POST":
+							s.handleActionSubmissionReleasedRequest([1]string{
+								args[0],
+							}, elemIsEscaped, w, r)
+						default:
+							s.notAllowed(w, r, "POST")
+						}
+
+						return
+					}
+
+					elem = origElem
+				case 'v': // Prefix: "validator-"
+					origElem := elem
+					if l := len("validator-"); len(elem) >= l && elem[0:l] == "validator-" {
+						elem = elem[l:]
+					} else {
+						break
+					}
+
+					if len(elem) == 0 {
+						break
+					}
+					switch elem[0] {
+					case 'u': // Prefix: "uploaded"
+						origElem := elem
+						if l := len("uploaded"); len(elem) >= l && elem[0:l] == "uploaded" {
+							elem = elem[l:]
+						} else {
+							break
+						}
+
+						if len(elem) == 0 {
+							// Leaf node.
+							switch r.Method {
+							case "POST":
+								s.handleActionSubmissionUploadedRequest([1]string{
+									args[0],
+								}, elemIsEscaped, w, r)
+							default:
+								s.notAllowed(w, r, "POST")
+							}
+
+							return
+						}
+
+						elem = origElem
+					case 'v': // Prefix: "validated"
+						origElem := elem
+						if l := len("validated"); len(elem) >= l && elem[0:l] == "validated" {
+							elem = elem[l:]
+						} else {
+							break
+						}
+
+						if len(elem) == 0 {
+							// Leaf node.
+							switch r.Method {
+							case "POST":
+								s.handleActionSubmissionValidatedRequest([1]string{
+									args[0],
+								}, elemIsEscaped, w, r)
+							default:
+								s.notAllowed(w, r, "POST")
+							}
+
+							return
+						}
+
+						elem = origElem
+					}
+
+					elem = origElem
+				}
+
+				elem = origElem
+			}
+
+			elem = origElem
+		}
+	}
+	s.notFound(w, r)
+}
+
+// Route is route object.
+type Route struct {
+	name        string
+	summary     string
+	operationID string
+	pathPattern string
+	count       int
+	args        [1]string
+}
+
+// Name returns ogen operation name.
+//
+// It is guaranteed to be unique and not empty.
+func (r Route) Name() string {
+	return r.name
+}
+
+// Summary returns OpenAPI summary.
+func (r Route) Summary() string {
+	return r.summary
+}
+
+// OperationID returns OpenAPI operationId.
+func (r Route) OperationID() string {
+	return r.operationID
+}
+
+// PathPattern returns OpenAPI path.
+func (r Route) PathPattern() string {
+	return r.pathPattern
+}
+
+// Args returns parsed arguments.
+func (r Route) Args() []string {
+	return r.args[:r.count]
+}
+
+// FindRoute finds Route for given method and path.
+//
+// Note: this method does not unescape path or handle reserved characters in path properly. Use FindPath instead.
+func (s *Server) FindRoute(method, path string) (Route, bool) {
+	return s.FindPath(method, &url.URL{Path: path})
+}
+
+// FindPath finds Route for given method and URL.
+func (s *Server) FindPath(method string, u *url.URL) (r Route, _ bool) {
+	var (
+		elem = u.Path
+		args = r.args
+	)
+	if rawPath := u.RawPath; rawPath != "" {
+		if normalized, ok := uri.NormalizeEscapedPath(rawPath); ok {
+			elem = normalized
+		}
+		defer func() {
+			for i, arg := range r.args[:r.count] {
+				if unescaped, err := url.PathUnescape(arg); err == nil {
+					r.args[i] = unescaped
+				}
+			}
+		}()
+	}
+
+	elem, ok := s.cutPrefix(elem)
+	if !ok {
+		return r, false
+	}
+
+	// Static code generated router with unwrapped path search.
+	switch {
+	default:
+		if len(elem) == 0 {
+			break
+		}
+		switch elem[0] {
+		case '/': // Prefix: "/submissions/"
+			origElem := elem
+			if l := len("/submissions/"); len(elem) >= l && elem[0:l] == "/submissions/" {
+				elem = elem[l:]
+			} else {
+				break
+			}
+
+			// Param: "SubmissionID"
+			// Match until "/"
+			idx := strings.IndexByte(elem, '/')
+			if idx < 0 {
+				idx = len(elem)
+			}
+			args[0] = elem[:idx]
+			elem = elem[idx:]
+
+			if len(elem) == 0 {
+				break
+			}
+			switch elem[0] {
+			case '/': // Prefix: "/status/"
+				origElem := elem
+				if l := len("/status/"); len(elem) >= l && elem[0:l] == "/status/" {
+					elem = elem[l:]
+				} else {
+					break
+				}
+
+				if len(elem) == 0 {
+					break
+				}
+				switch elem[0] {
+				case 'r': // Prefix: "releaser-released"
+					origElem := elem
+					if l := len("releaser-released"); len(elem) >= l && elem[0:l] == "releaser-released" {
+						elem = elem[l:]
+					} else {
+						break
+					}
+
+					if len(elem) == 0 {
+						// Leaf node.
+						switch method {
+						case "POST":
+							r.name = ActionSubmissionReleasedOperation
+							r.summary = "(Internal endpoint) Role Releaser changes status from releasing -> released"
+							r.operationID = "actionSubmissionReleased"
+							r.pathPattern = "/submissions/{SubmissionID}/status/releaser-released"
+							r.args = args
+							r.count = 1
+							return r, true
+						default:
+							return
+						}
+					}
+
+					elem = origElem
+				case 'v': // Prefix: "validator-"
+					origElem := elem
+					if l := len("validator-"); len(elem) >= l && elem[0:l] == "validator-" {
+						elem = elem[l:]
+					} else {
+						break
+					}
+
+					if len(elem) == 0 {
+						break
+					}
+					switch elem[0] {
+					case 'u': // Prefix: "uploaded"
+						origElem := elem
+						if l := len("uploaded"); len(elem) >= l && elem[0:l] == "uploaded" {
+							elem = elem[l:]
+						} else {
+							break
+						}
+
+						if len(elem) == 0 {
+							// Leaf node.
+							switch method {
+							case "POST":
+								r.name = ActionSubmissionUploadedOperation
+								r.summary = "(Internal endpoint) Role Validator changes status from Uploading -> Uploaded"
+								r.operationID = "actionSubmissionUploaded"
+								r.pathPattern = "/submissions/{SubmissionID}/status/validator-uploaded"
+								r.args = args
+								r.count = 1
+								return r, true
+							default:
+								return
+							}
+						}
+
+						elem = origElem
+					case 'v': // Prefix: "validated"
+						origElem := elem
+						if l := len("validated"); len(elem) >= l && elem[0:l] == "validated" {
+							elem = elem[l:]
+						} else {
+							break
+						}
+
+						if len(elem) == 0 {
+							// Leaf node.
+							switch method {
+							case "POST":
+								r.name = ActionSubmissionValidatedOperation
+								r.summary = "(Internal endpoint) Role Validator changes status from Validating -> Validated"
+								r.operationID = "actionSubmissionValidated"
+								r.pathPattern = "/submissions/{SubmissionID}/status/validator-validated"
+								r.args = args
+								r.count = 1
+								return r, true
+							default:
+								return
+							}
+						}
+
+						elem = origElem
+					}
+
+					elem = origElem
+				}
+
+				elem = origElem
+			}
+
+			elem = origElem
+		}
+	}
+	return r, false
+}

pkg/internal/oas_schemas_gen.go

@@ -0,0 +1,119 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+import (
+	"fmt"
+)
+
+func (s *ErrorStatusCode) Error() string {
+	return fmt.Sprintf("code %d: %+v", s.StatusCode, s.Response)
+}
+
+// ActionSubmissionReleasedNoContent is response for ActionSubmissionReleased operation.
+type ActionSubmissionReleasedNoContent struct{}
+
+// ActionSubmissionUploadedNoContent is response for ActionSubmissionUploaded operation.
+type ActionSubmissionUploadedNoContent struct{}
+
+// ActionSubmissionValidatedNoContent is response for ActionSubmissionValidated operation.
+type ActionSubmissionValidatedNoContent struct{}
+
+// Represents error object.
+// Ref: #/components/schemas/Error
+type Error struct {
+	Code    int64  `json:"code"`
+	Message string `json:"message"`
+}
+
+// GetCode returns the value of Code.
+func (s *Error) GetCode() int64 {
+	return s.Code
+}
+
+// GetMessage returns the value of Message.
+func (s *Error) GetMessage() string {
+	return s.Message
+}
+
+// SetCode sets the value of Code.
+func (s *Error) SetCode(val int64) {
+	s.Code = val
+}
+
+// SetMessage sets the value of Message.
+func (s *Error) SetMessage(val string) {
+	s.Message = val
+}
+
+// ErrorStatusCode wraps Error with StatusCode.
+type ErrorStatusCode struct {
+	StatusCode int
+	Response   Error
+}
+
+// GetStatusCode returns the value of StatusCode.
+func (s *ErrorStatusCode) GetStatusCode() int {
+	return s.StatusCode
+}
+
+// GetResponse returns the value of Response.
+func (s *ErrorStatusCode) GetResponse() Error {
+	return s.Response
+}
+
+// SetStatusCode sets the value of StatusCode.
+func (s *ErrorStatusCode) SetStatusCode(val int) {
+	s.StatusCode = val
+}
+
+// SetResponse sets the value of Response.
+func (s *ErrorStatusCode) SetResponse(val Error) {
+	s.Response = val
+}
+
+// NewOptInt64 returns new OptInt64 with value set to v.
+func NewOptInt64(v int64) OptInt64 {
+	return OptInt64{
+		Value: v,
+		Set:   true,
+	}
+}
+
+// OptInt64 is optional int64.
+type OptInt64 struct {
+	Value int64
+	Set   bool
+}
+
+// IsSet returns true if OptInt64 was set.
+func (o OptInt64) IsSet() bool { return o.Set }
+
+// Reset unsets value.
+func (o *OptInt64) Reset() {
+	var v int64
+	o.Value = v
+	o.Set = false
+}
+
+// SetTo sets value to v.
+func (o *OptInt64) SetTo(v int64) {
+	o.Set = true
+	o.Value = v
+}
+
+// Get returns value and boolean that denotes whether value was set.
+func (o OptInt64) Get() (v int64, ok bool) {
+	if !o.Set {
+		return v, false
+	}
+	return o.Value, true
+}
+
+// Or returns value if set, or given parameter if does not.
+func (o OptInt64) Or(d int64) int64 {
+	if v, ok := o.Get(); ok {
+		return v
+	}
+	return d
+}

pkg/internal/oas_server_gen.go

@@ -0,0 +1,52 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+import (
+	"context"
+)
+
+// Handler handles operations described by OpenAPI v3 specification.
+type Handler interface {
+	// ActionSubmissionReleased implements actionSubmissionReleased operation.
+	//
+	// (Internal endpoint) Role Releaser changes status from releasing -> released.
+	//
+	// POST /submissions/{SubmissionID}/status/releaser-released
+	ActionSubmissionReleased(ctx context.Context, params ActionSubmissionReleasedParams) error
+	// ActionSubmissionUploaded implements actionSubmissionUploaded operation.
+	//
+	// (Internal endpoint) Role Validator changes status from Uploading -> Uploaded.
+	//
+	// POST /submissions/{SubmissionID}/status/validator-uploaded
+	ActionSubmissionUploaded(ctx context.Context, params ActionSubmissionUploadedParams) error
+	// ActionSubmissionValidated implements actionSubmissionValidated operation.
+	//
+	// (Internal endpoint) Role Validator changes status from Validating -> Validated.
+	//
+	// POST /submissions/{SubmissionID}/status/validator-validated
+	ActionSubmissionValidated(ctx context.Context, params ActionSubmissionValidatedParams) error
+	// NewError creates *ErrorStatusCode from error returned by handler.
+	//
+	// Used for common default response.
+	NewError(ctx context.Context, err error) *ErrorStatusCode
+}
+
+// Server implements http server based on OpenAPI v3 specification and
+// calls Handler to handle requests.
+type Server struct {
+	h Handler
+	baseServer
+}
+
+// NewServer creates new Server.
+func NewServer(h Handler, opts ...ServerOption) (*Server, error) {
+	s, err := newServerConfig(opts...).baseServer()
+	if err != nil {
+		return nil, err
+	}
+	return &Server{
+		h:          h,
+		baseServer: s,
+	}, nil
+}

pkg/internal/oas_unimplemented_gen.go

@@ -0,0 +1,49 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+import (
+	"context"
+
+	ht "github.com/ogen-go/ogen/http"
+)
+
+// UnimplementedHandler is no-op Handler which returns http.ErrNotImplemented.
+type UnimplementedHandler struct{}
+
+var _ Handler = UnimplementedHandler{}
+
+// ActionSubmissionReleased implements actionSubmissionReleased operation.
+//
+// (Internal endpoint) Role Releaser changes status from releasing -> released.
+//
+// POST /submissions/{SubmissionID}/status/releaser-released
+func (UnimplementedHandler) ActionSubmissionReleased(ctx context.Context, params ActionSubmissionReleasedParams) error {
+	return ht.ErrNotImplemented
+}
+
+// ActionSubmissionUploaded implements actionSubmissionUploaded operation.
+//
+// (Internal endpoint) Role Validator changes status from Uploading -> Uploaded.
+//
+// POST /submissions/{SubmissionID}/status/validator-uploaded
+func (UnimplementedHandler) ActionSubmissionUploaded(ctx context.Context, params ActionSubmissionUploadedParams) error {
+	return ht.ErrNotImplemented
+}
+
+// ActionSubmissionValidated implements actionSubmissionValidated operation.
+//
+// (Internal endpoint) Role Validator changes status from Validating -> Validated.
+//
+// POST /submissions/{SubmissionID}/status/validator-validated
+func (UnimplementedHandler) ActionSubmissionValidated(ctx context.Context, params ActionSubmissionValidatedParams) error {
+	return ht.ErrNotImplemented
+}
+
+// NewError creates *ErrorStatusCode from error returned by handler.
+//
+// Used for common default response.
+func (UnimplementedHandler) NewError(ctx context.Context, err error) (r *ErrorStatusCode) {
+	r = new(ErrorStatusCode)
+	return r
+}

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,24 @@ package model
 
 // Requests are sent from maps-service to validator
 
-type CreateSubmissionRequest 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 {
+type ValidateRequest struct {
 	// submission_id is passed back in the response message
-	SubmissionID       int64
-	ModelID           uint64
-	ModelVersion      uint64
-	ValidatedModelID *uint64 // optional value
-}
-
-type ValidateMapfixRequest struct {
-	MapfixID           int64
-	ModelID           uint64
-	ModelVersion      uint64
-	ValidatedModelID *uint64 // optional value
+	SubmissionID     int64
+	ModelID          uint64
+	ModelVersion     uint64
+	ValidatedModelID uint64 // optional value
 }
 
 // Create a new map
-type UploadSubmissionRequest struct {
-	SubmissionID  int64
+type PublishNewRequest struct {
+	SubmissionID int64
 	ModelID      uint64
 	ModelVersion uint64
 	ModelName    string
 }
 
-type UploadMapfixRequest struct {
-	MapfixID       int64
+type PublishFixRequest struct {
+	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

@@ -17,7 +17,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 (
-	"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)
-}
+import "time"
 
 type Script struct {
 	ID           int64 `gorm:"primaryKey"`
-	Name         string
-	Hash         int64 // postgres does not support unsigned integers, so we have to pretend
+	Hash         uint64
 	Source       string
-	ResourceType ResourceType // is this a submission or is it a mapfix
-	ResourceID   int64 // which submission / mapfix did this script first appear in
+	SubmissionID int64 // which submission did this script first appear in
 	CreatedAt    time.Time
 	UpdatedAt    time.Time
 }

pkg/model/submission.go

@@ -2,42 +2,37 @@ package model
 
 import "time"
 
-type SubmissionStatus int32
+type Status int32
 
 const (
-	// Phase: Creation
-	SubmissionStatusUnderConstruction   SubmissionStatus = 0
-	SubmissionStatusChangesRequested    SubmissionStatus = 1
-
-	// Phase: Review
-	SubmissionStatusSubmitting          SubmissionStatus = 2
-	SubmissionStatusSubmitted           SubmissionStatus = 3
+	// Phase: Final Status
+	StatusReleased  Status = 9
+	StatusRejected  Status = 8
 
 	// Phase: Testing
-	SubmissionStatusAcceptedUnvalidated SubmissionStatus = 4 // pending script review, can re-trigger validation
-	SubmissionStatusValidating          SubmissionStatus = 5
-	SubmissionStatusValidated           SubmissionStatus = 6
-	SubmissionStatusUploading           SubmissionStatus = 7
-	SubmissionStatusUploaded            SubmissionStatus = 8 // uploaded to the group, but pending release
+	StatusUploaded   Status = 7 // uploaded to the group, but pending release
+	StatusUploading  Status = 6
+	StatusValidated  Status = 5
+	StatusValidating Status = 4
+	StatusAccepted   Status = 3
 
-	// Phase: Final SubmissionStatus
-	SubmissionStatusRejected            SubmissionStatus = 9
-	SubmissionStatusReleased            SubmissionStatus = 10
+	// Phase: Creation
+	StatusChangesRequested  Status = 2
+	StatusSubmitted         Status = 1
+	StatusUnderConstruction Status = 0
 )
 
 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.
-	StatusID      SubmissionStatus
+	TargetAssetID uint64 // where to upload map fix.  if the TargetAssetID is 0, it's a new map.
+	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,191 @@ 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 {
+		return nil, ErrPermissionDenied
+	}
+
+	from_script, err := svc.DB.Scripts().Get(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.DB.ScriptPolicy().Create(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.ID{
+		ID: script.ID,
+	}, nil
+}
+
+
+// ListScriptPolicy implements listScriptPolicy operation.
+//
+// Get list of script policies.
+//
+// GET /script-policy
+func (svc *Service) ListScriptPolicy(ctx context.Context, request *api.ListScriptPolicyReq) ([]api.ScriptPolicy, error) {
 	filter := datastore.Optional()
-	return ScriptPolicyFilter(filter)
-}
-func (filter ScriptPolicyFilter) SetFromScriptHash(from_script_hash int64) {
-	// Finally, type safety!
-	datastore.OptionalMap(filter).Add("from_script_hash", from_script_hash)
-}
-func (filter ScriptPolicyFilter) SetToScriptID(to_script_id int64) {
-	datastore.OptionalMap(filter).Add("to_script_id", to_script_id)
-}
-func (filter ScriptPolicyFilter) SetPolicy(policy int32) {
-	datastore.OptionalMap(filter).Add("policy", policy)
+	//fmt.Println(request)
+	if request.Filter.IsSet() {
+		filter.AddNotNil("from_script_hash", request.Filter.Value.FromScriptHash)
+		filter.AddNotNil("to_script_id", request.Filter.Value.ToScriptID)
+		filter.AddNotNil("policy", request.Filter.Value.Policy)
+	}
+
+	items, err := svc.DB.ScriptPolicy().List(ctx, filter, model.Page{
+		Number: request.Page.GetPage(),
+		Size:   request.Page.GetLimit(),
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	var resp []api.ScriptPolicy
+	for i := 0; i < len(items); i++ {
+		resp = append(resp, api.ScriptPolicy{
+			ID:             items[i].ID,
+			FromScriptHash: fmt.Sprintf("%x", items[i].FromScriptHash),
+			ToScriptID:     items[i].ToScriptID,
+			Policy:         int32(items[i].Policy),
+		})
+	}
+
+	return resp, nil
 }
 
-func (svc *Service) CreateScriptPolicy(ctx context.Context, script model.ScriptPolicy) (model.ScriptPolicy, error) {
-	return svc.db.ScriptPolicy().Create(ctx, script)
+// DeleteScriptPolicy implements deleteScriptPolicy operation.
+//
+// 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) {
-	return svc.db.ScriptPolicy().List(ctx, datastore.OptionalMap(filter), page)
+// GetScriptPolicy implements getScriptPolicy operation.
+//
+// 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 {
-	return svc.db.ScriptPolicy().Delete(ctx, id)
+// GetScriptPolicyFromHash implements getScriptPolicyFromHash operation.
+//
+// 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) {
-	return svc.db.ScriptPolicy().Get(ctx, id)
-}
+// UpdateScriptPolicy implements updateScriptPolicy operation.
+//
+// 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 {
-	return svc.db.ScriptPolicy().Update(ctx, id, datastore.OptionalMap(pmap))
+	if !userInfo.Roles.ScriptWrite {
+		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 {
-	filter := datastore.Optional()
-	return ScriptFilter(filter)
-}
-func (filter ScriptFilter) SetName(name string) {
-	datastore.OptionalMap(filter).Add("name", name)
-}
-func (filter ScriptFilter) SetSource(source string) {
-	datastore.OptionalMap(filter).Add("source", source)
-}
-func (filter ScriptFilter) SetHash(hash int64) {
-	datastore.OptionalMap(filter).Add("hash", hash)
-}
-func (filter ScriptFilter) SetResourceType(resource_type int32) {
-	datastore.OptionalMap(filter).Add("resource_type", resource_type)
-}
-func (filter ScriptFilter) SetResourceID(resource_id int64) {
-	datastore.OptionalMap(filter).Add("resource_id", resource_id)
+	if !userInfo.Roles.ScriptWrite {
+		return nil, ErrPermissionDenied
+	}
+
+	script, err := svc.DB.Scripts().Create(ctx, model.Script{
+		ID:           0,
+		Hash:         siphash.Hash(0, 0, []byte(req.Source)),
+		Source:       req.Source,
+		SubmissionID: req.SubmissionID.Or(0),
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return &api.ID{
+		ID: script.ID,
+	}, nil
 }
 
-func (svc *Service) CreateScript(ctx context.Context, script model.Script) (model.Script, error) {
-	return svc.db.Scripts().Create(ctx, script)
+// DeleteScript implements deleteScript operation.
+//
+// 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) {
-	return svc.db.Scripts().List(ctx, datastore.OptionalMap(filter), page)
+// 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) {
+	_, 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 {
-	return svc.db.Scripts().Delete(ctx, id)
-}
+// 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 {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return ErrUserInfo
+	}
 
-func (svc *Service) GetScript(ctx context.Context, id int64) (model.Script, error) {
-	return svc.db.Scripts().Get(ctx, id)
-}
+	if !userInfo.Roles.ScriptWrite {
+		return ErrPermissionDenied
+	}
 
-func (svc *Service) UpdateScript(ctx context.Context, id int64, pmap ScriptFilter) error {
-	return svc.db.Scripts().Update(ctx, id, datastore.OptionalMap(pmap))
+	pmap := datastore.Optional()
+	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,97 @@
+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
+	SubmissionRelease bool
+	SubmissionReview  bool
+	ScriptWrite       bool
+	// Thumbnail bool
+	// MapDownload
+
+	// automated roles
+	Maptest   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.SubmissionRelease = 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"
-	"git.itzana.me/strafesnet/go-grpc/users"
+	"context"
+	"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
-	nats   nats.JetStreamContext
-	maps   maps.MapsServiceClient
-	users  users.UsersServiceClient
+	DB   datastore.Datastore
+	Nats nats.JetStreamContext
 }
 
-func NewService(
-	db datastore.Datastore,
-	nats nats.JetStreamContext,
-	maps maps.MapsServiceClient,
-	users users.UsersServiceClient,
-) Service {
-	return Service{
-		db:     db,
-		nats:   nats,
-		maps:   maps,
-		users:  users,
+// 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, 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/service/submissions.go

@@ -2,119 +2,360 @@ 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 {
-	update := datastore.Optional()
-	return SubmissionUpdate(update)
+	submission, err := svc.DB.Submissions().Create(ctx, model.Submission{
+		ID:            0,
+		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) {
-	datastore.OptionalMap(update).Add("display_name", display_name)
-}
-func (update SubmissionUpdate) SetCreator(creator string) {
-	datastore.OptionalMap(update).Add("creator", creator)
-}
-func (update SubmissionUpdate) SetGameID(game_id uint32) {
-	datastore.OptionalMap(update).Add("game_id", game_id)
-}
-func (update SubmissionUpdate) SetSubmitter(submitter uint64) {
-	datastore.OptionalMap(update).Add("submitter", submitter)
-}
-func (update SubmissionUpdate) SetAssetID(asset_id uint64) {
-	datastore.OptionalMap(update).Add("asset_id", asset_id)
-}
-func (update SubmissionUpdate) SetAssetVersion(asset_version uint64) {
-	datastore.OptionalMap(update).Add("asset_version", asset_version)
-}
-func (update SubmissionUpdate) SetValidatedAssetID(validated_asset_id uint64) {
-	datastore.OptionalMap(update).Add("validated_asset_id", validated_asset_id)
-}
-func (update SubmissionUpdate) SetValidatedAssetVersion(validated_asset_version uint64) {
-	datastore.OptionalMap(update).Add("validated_asset_version", validated_asset_version)
-}
-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)
+// GetSubmission implements getSubmission operation.
+//
+// Retrieve map with ID.
+//
+// GET /submissions/{SubmissionID}
+func (svc *Service) GetSubmission(ctx context.Context, params api.GetSubmissionParams) (*api.Submission, error) {
+	submission, err := svc.DB.Submissions().Get(ctx, params.SubmissionID)
+	if err != nil {
+		return nil, err
+	}
+	return &api.Submission{
+		ID:            submission.ID,
+		DisplayName:   submission.DisplayName,
+		Creator:       submission.Creator,
+		GameID:        submission.GameID,
+		CreatedAt:     submission.CreatedAt.Unix(),
+		UpdatedAt:     submission.UpdatedAt.Unix(),
+		Submitter:     int64(submission.Submitter),
+		AssetID:       int64(submission.AssetID),
+		AssetVersion:  int64(submission.AssetVersion),
+		Completed:     submission.Completed,
+		TargetAssetID: api.NewOptInt64(int64(submission.TargetAssetID)),
+		StatusID:      int32(submission.StatusID),
+	}, nil
 }
 
-type SubmissionFilter datastore.OptionalMap
-
-func NewSubmissionFilter(
-) SubmissionFilter {
+// ListSubmissions implements listSubmissions operation.
+//
+// Get list of submissions.
+//
+// GET /submissions
+func (svc *Service) ListSubmissions(ctx context.Context, request *api.ListSubmissionsReq) ([]api.Submission, error) {
 	filter := datastore.Optional()
-	return SubmissionFilter(filter)
-}
-func (update SubmissionFilter) SetDisplayName(display_name string) {
-	datastore.OptionalMap(update).Add("display_name", display_name)
-}
-func (update SubmissionFilter) SetCreator(creator string) {
-	datastore.OptionalMap(update).Add("creator", creator)
-}
-func (update SubmissionFilter) SetGameID(game_id uint32) {
-	datastore.OptionalMap(update).Add("game_id", game_id)
-}
-func (update SubmissionFilter) SetSubmitter(submitter uint64) {
-	datastore.OptionalMap(update).Add("submitter", submitter)
-}
-func (update SubmissionFilter) SetAssetID(asset_id uint64) {
-	datastore.OptionalMap(update).Add("asset_id", asset_id)
-}
-func (update SubmissionFilter) SetAssetVersion(asset_version uint64) {
-	datastore.OptionalMap(update).Add("asset_version", asset_version)
-}
-func (update SubmissionFilter) SetUploadedAssetID(uploaded_asset_id uint64) {
-	datastore.OptionalMap(update).Add("uploaded_asset_id", uploaded_asset_id)
-}
-func (update SubmissionFilter) SetStatuses(statuses []model.SubmissionStatus) {
-	datastore.OptionalMap(update).Add("status_id", statuses)
+	//fmt.Println(request)
+	if request.Filter.IsSet() {
+		filter.AddNotNil("display_name", request.Filter.Value.DisplayName)
+		filter.AddNotNil("creator", request.Filter.Value.Creator)
+		filter.AddNotNil("game_id", request.Filter.Value.GameID)
+	}
+
+	items, err := svc.DB.Submissions().List(ctx, filter, model.Page{
+		Number: request.Page.GetPage(),
+		Size:   request.Page.GetLimit(),
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	var resp []api.Submission
+	for i := 0; i < len(items); i++ {
+		resp = append(resp, api.Submission{
+			ID:            items[i].ID,
+			DisplayName:   items[i].DisplayName,
+			Creator:       items[i].Creator,
+			GameID:        items[i].GameID,
+			CreatedAt:     items[i].CreatedAt.Unix(),
+			UpdatedAt:     items[i].UpdatedAt.Unix(),
+			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) {
-	return svc.db.Submissions().Create(ctx, script)
+// PatchSubmissionCompleted implements patchSubmissionCompleted operation.
+//
+// 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) {
-	return svc.db.Submissions().List(ctx, datastore.OptionalMap(filter), page, sort)
+// PatchSubmissionModel implements patchSubmissionModel operation.
+//
+// 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) {
-	return svc.db.Submissions().ListWithTotal(ctx, datastore.OptionalMap(filter), page, sort)
+// ActionSubmissionReject invokes actionSubmissionReject operation.
+//
+// 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) DeleteSubmission(ctx context.Context, id int64) error {
-	return svc.db.Submissions().Delete(ctx, id)
+// ActionSubmissionRequestChanges invokes actionSubmissionRequestChanges operation.
+//
+// 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) GetSubmission(ctx context.Context, id int64) (model.Submission, error) {
-	return svc.db.Submissions().Get(ctx, id)
+// ActionSubmissionRevoke invokes actionSubmissionRevoke operation.
+//
+// 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) GetSubmissionList(ctx context.Context, ids []int64) ([]model.Submission, error) {
-	return svc.db.Submissions().GetList(ctx, ids)
+// ActionSubmissionSubmit invokes actionSubmissionSubmit operation.
+//
+// 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) UpdateSubmission(ctx context.Context, id int64, pmap SubmissionUpdate) error {
-	return svc.db.Submissions().Update(ctx, id, datastore.OptionalMap(pmap))
+// ActionSubmissionTriggerUpload invokes actionSubmissionTriggerUpload operation.
+//
+// Role Admin changes status from Validated -> Uploading.
+//
+// POST /submissions/{SubmissionID}/status/trigger-upload
+func (svc *Service) ActionSubmissionTriggerUpload(ctx context.Context, params api.ActionSubmissionTriggerUploadParams) error {
+	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	if !ok {
+		return ErrUserInfo
+	}
+
+	// check if caller has required role
+	if !userInfo.Roles.SubmissionRelease {
+		return ErrPermissionDenied
+	}
+
+	// transaction
+	smap := datastore.Optional()
+	smap.Add("status_id", model.StatusUploading)
+	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,
+			// publish as displayname, whatever
+			ModelName:    submission.DisplayName,
+		}
+
+		j, err := json.Marshal(publish_new_request)
+		if err != nil {
+			return err
+		}
+
+		svc.Nats.Publish("maptest.submissions.publishnew", []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.publishfix", []byte(j))
+	}
+
+	return nil
 }
 
-func (svc *Service) UpdateSubmissionIfStatus(ctx context.Context, id int64, statuses []model.SubmissionStatus, pmap SubmissionUpdate) error {
-	return svc.db.Submissions().IfStatusThenUpdate(ctx, id, statuses, datastore.OptionalMap(pmap))
-}
+// ActionSubmissionTriggerValidate invokes actionSubmissionTriggerValidate operation.
+//
+// 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
+	}
 
-func (svc *Service) UpdateAndGetSubmissionIfStatus(ctx context.Context, id int64, statuses []model.SubmissionStatus, pmap SubmissionUpdate) (model.Submission, error) {
-	return svc.db.Submissions().IfStatusThenUpdateAndGet(ctx, id, statuses, datastore.OptionalMap(pmap))
+	// 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
 }

pkg/service_internal/service_internal.go

@@ -0,0 +1,25 @@
+package service_internal
+
+import (
+	"context"
+	internal "git.itzana.me/strafesnet/maps-service/pkg/internal"
+	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
+	"github.com/nats-io/nats.go"
+)
+
+type Service struct {
+	DB   datastore.Datastore
+	Nats nats.JetStreamContext
+}
+
+// yay duplicate code
+func (svc *Service) NewError(ctx context.Context, err error) *internal.ErrorStatusCode {
+	status := 500
+	return &internal.ErrorStatusCode{
+		StatusCode: status,
+		Response: internal.Error{
+			Code:    int64(status),
+			Message: err.Error(),
+		},
+	}
+}

pkg/service_internal/submissions.go

@@ -0,0 +1,54 @@
+package service_internal
+
+import (
+	"context"
+
+	internal "git.itzana.me/strafesnet/maps-service/pkg/internal"
+	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
+	"git.itzana.me/strafesnet/maps-service/pkg/model"
+)
+
+// ActionSubmissionValidate invokes actionSubmissionValidate operation.
+//
+// Role Validator changes status from Validating -> Validated.
+//
+// POST /submissions/{SubmissionID}/status/validate
+func (svc *Service) ActionSubmissionValidated(ctx context.Context, params internal.ActionSubmissionValidatedParams) 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)
+}
+
+// ActionSubmissionReleased implements actionSubmissionReleased operation.
+//
+// (Internal endpoint) Role Releaser changes status from Uploaded -> Released.
+//
+// POST /submissions/{SubmissionID}/status/releaser-released
+func (svc *Service) ActionSubmissionReleased(ctx context.Context, params internal.ActionSubmissionReleasedParams) error {
+	println("[ActionSubmissionReleased] Implicit Validator permission granted!")
+
+	// transaction
+	smap := datastore.Optional()
+	smap.Add("status_id", model.StatusReleased)
+	return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.Status{model.StatusUploaded}, smap)
+}
+
+// ActionSubmissionUploaded implements actionSubmissionUploaded operation.
+//
+// (Internal endpoint) Role Validator changes status from Uploading -> Uploaded.
+//
+// POST /submissions/{SubmissionID}/status/validator-uploaded
+func (svc *Service) ActionSubmissionUploaded(ctx context.Context, params internal.ActionSubmissionUploadedParams) error {
+	println("[ActionSubmissionUploaded] Implicit Validator permission granted!")
+
+	// transaction
+	smap := datastore.Optional()
+	smap.Add("status_id", model.StatusUploaded)
+	if params.TargetAssetID.IsSet() {
+		smap.AddNotNil("target_asset_id", params.TargetAssetID.Value)
+	}
+	return svc.DB.Submissions().IfStatusThenUpdate(ctx, params.SubmissionID, []model.Status{model.StatusUploading}, 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
-}

releaser/.cargo/config.toml

@@ -0,0 +1,2 @@
+[registries.strafesnet]
+index = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"

releaser/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "releaser"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+submissions-api = { version = "0.2.1", features = ["internal"], default-features = false, registry = "strafesnet" }
+rbx_asset = { version = "0.2.5", registry = "strafesnet" }
+rust-grpc = { version = "1.0.3", registry = "strafesnet" }
+tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread", "signal"] }
+tonic = "0.12.3"

releaser/Containerfile

@@ -0,0 +1,24 @@
+# Using the `rust-musl-builder` as base image, instead of
+# the official Rust toolchain
+FROM docker.io/clux/muslrust:stable AS chef
+USER root
+RUN cargo install cargo-chef
+WORKDIR /app
+
+FROM chef AS planner
+COPY . .
+RUN cargo chef prepare --recipe-path recipe.json
+
+FROM chef AS builder
+COPY --from=planner /app/recipe.json recipe.json
+
+# Notice that we are specifying the --target flag!
+RUN cargo chef cook --release --target x86_64-unknown-linux-musl --recipe-path recipe.json
+COPY . .
+RUN cargo build --release --target x86_64-unknown-linux-musl --bin releaser
+
+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/releaser /usr/local/bin/
+USER myuser
+ENTRYPOINT ["/usr/local/bin/releaser"]

releaser/src/main.rs

@@ -0,0 +1,32 @@
+#[allow(dead_code)]
+#[derive(Debug)]
+pub enum StartupError{
+	API(submissions_api::ReqwestError),
+	GRPCConnect(tonic::transport::Error),
+}
+impl std::fmt::Display for StartupError{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for StartupError{}
+
+// annoying mile-long type
+pub type MapsServiceClient=rust_grpc::maps::maps_service_client::MapsServiceClient<tonic::transport::channel::Channel>;
+
+#[tokio::main]
+async fn main()->Result<(),StartupError>{
+	// maps-service api
+	let api_host=std::env::var("API_HOST").expect("API_HOST env required");
+	let api=submissions_api::internal::Context::new(api_host).map_err(StartupError::API)?;
+
+	// data-service grpc for creating map entries
+	let data_host=std::env::var("DATA_HOST").expect("DATA_HOST env required");
+	let maps_grpc=crate::MapsServiceClient::connect(data_host).await.map_err(StartupError::GRPCConnect)?;
+
+	// request maps pending release
+	// randomize list
+	// release maps
+
+	Ok(())
+}

submissions-api-rs/.gitignore

@@ -0,0 +1 @@
+/target