Wrap up changing all tables to refine

packages/common/lib/api/filtering/Filter.ts

@@ -292,7 +292,7 @@ export class SomeFilter {
   @Field(() => ArrayBooleanFilter, { nullable: true })
   arrayBooleanFilter?: ArrayBooleanFilter;
 
-  get filter(): SomeFilterType {
+  static getFilter(some: SomeFilter): SomeFilterType {
     const {
       nullFilter,
       singleStringFilter,
@@ -305,7 +305,7 @@ export class SomeFilter {
       arrayNumberFilter,
       arrayDateFilter,
       arrayBooleanFilter,
-    } = this as Partial<typeof this>;
+    } = some;
 
     return (nullFilter ??
       singleStringFilter ??

packages/common/lib/api/params/ListMarathonsResponse.ts

@@ -1,11 +1,11 @@
-import { Matches } from "class-validator";
-import { GraphQLNonEmptyString } from "graphql-scalars";
 import { DateTime } from "luxon";
 import { ArgsType, Field, InputType, ObjectType } from "type-graphql";
 
+import type { MarathonYearString } from "../../utility/primitive/SimpleTypes.js";
 import { FilteredListQueryArgs } from "../filtering/FilteredListQueryArgs.js";
 import { MarathonNode } from "../resources/Marathon.js";
 import { DateTimeScalar } from "../scalars/DateTimeISO.js";
+import { MarathonYearScalar } from "../scalars/MarathonYear.js";
 import {
   IsAfterDateTime,
   IsBeforeDateTime,
@@ -22,9 +22,8 @@ export class ListMarathonsResponse extends AbstractGraphQLPaginatedResponse<Mara
 
 @InputType()
 export class CreateMarathonInput {
-  @Matches(/^DB\d{2}$/, { message: "Year must be in the format DByy" })
-  @Field(() => GraphQLNonEmptyString)
-  year!: string;
+  @Field(() => MarathonYearScalar)
+  year!: MarathonYearString;
 
   @IsBeforeDateTime("endDate")
   @Field(() => DateTimeScalar, { nullable: true })
@@ -37,9 +36,8 @@ export class CreateMarathonInput {
 
 @InputType()
 export class SetMarathonInput {
-  @Matches(/^DB\d{2}$/, { message: "Year must be in the format DByy" })
-  @Field(() => GraphQLNonEmptyString)
-  year!: string;
+  @Field(() => MarathonYearScalar)
+  year!: MarathonYearString;
 
   @IsBeforeDateTime("endDate")
   @Field(() => DateTimeScalar, { nullable: true })

packages/common/lib/api/params/SingleTeamResponse.ts

@@ -1,11 +1,9 @@
 import { GraphQLNonEmptyString } from "graphql-scalars";
 import { ArgsType, Field, InputType, Int, ObjectType } from "type-graphql";
 
-import { DbRole } from "../../authorization/structures.js";
 import { OptionalToNullable } from "../../utility/primitive/TypeUtils.js";
 import { FilteredListQueryArgs } from "../filtering/FilteredListQueryArgs.js";
 import { TeamLegacyStatus, TeamNode, TeamType } from "../resources/Team.js";
-import { type GlobalId, GlobalIdScalar } from "../scalars/GlobalId.js";
 import { AbstractGraphQLPaginatedResponse } from "./ApiResponse.js";
 @ObjectType("ListTeamsResponse", {
   implements: AbstractGraphQLPaginatedResponse<TeamNode>,
@@ -65,20 +63,8 @@ export class ListTeamsArgs extends FilteredListQueryArgs("TeamResolver", [
   "name",
   "type",
   "legacyStatus",
-  "marathonId",
-]) {
-  @Field(() => [TeamType], { nullable: true })
-  type!: [TeamType] | null;
-
-  @Field(() => [TeamLegacyStatus], { nullable: true })
-  legacyStatus!: [TeamLegacyStatus] | null;
-
-  @Field(() => [DbRole], { nullable: true, deprecationReason: "Use type" })
-  visibility!: [DbRole] | null;
-
-  @Field(() => [GlobalIdScalar], { nullable: true })
-  marathonId!: GlobalId[] | null;
-}
+  "marathonYear",
+]) {}
 
 @ObjectType("DbFundsTeamInfo")
 export class DbFundsTeamInfo {

packages/common/lib/api/resources/Marathon.ts

@@ -2,9 +2,11 @@ import { DateTimeISOResolver } from "graphql-scalars";
 import type { DateTime } from "luxon";
 import { Field, ObjectType } from "type-graphql";
 
+import type { MarathonYearString } from "../../utility/primitive/SimpleTypes.js";
 import { createNodeClasses, Node } from "../relay.js";
 import type { GlobalId } from "../scalars/GlobalId.js";
 import { GlobalIdScalar } from "../scalars/GlobalId.js";
+import { MarathonYearScalar } from "../scalars/MarathonYear.js";
 import { TimestampedResource } from "./Resource.js";
 
 @ObjectType({
@@ -13,8 +15,8 @@ import { TimestampedResource } from "./Resource.js";
 export class MarathonNode extends TimestampedResource implements Node {
   @Field(() => GlobalIdScalar)
   id!: GlobalId;
-  @Field(() => String)
-  year!: string;
+  @Field(() => MarathonYearScalar)
+  year!: MarathonYearString;
   @Field(() => DateTimeISOResolver, { nullable: true })
   startDate?: DateTime | undefined | null;
   @Field(() => DateTimeISOResolver, { nullable: true })

packages/common/lib/api/scalars/DateTimeISO.ts

@@ -3,6 +3,7 @@ import { DateTime } from "luxon";
 
 export const DateTimeScalar = new GraphQLScalarType<DateTime<true>, string>({
   name: "LuxonDateTime",
+  specifiedByURL: "https://datatracker.ietf.org/doc/html/rfc3339",
   description: "Cursor custom scalar type",
   parseValue(value): DateTime<true> {
     if (typeof value === "string") {

packages/common/lib/api/scalars/MarathonYear.ts

@@ -0,0 +1,52 @@
+import { GraphQLScalarType, Kind } from "graphql";
+
+import type { MarathonYearString } from "../../utility/primitive/SimpleTypes.js";
+
+const marathonYearRegex = /^DB\d{2}$/;
+function isMarathonYearString(value: string): value is MarathonYearString {
+  return marathonYearRegex.test(value);
+}
+
+export const MarathonYearScalar = new GraphQLScalarType({
+  name: "MarathonYear",
+  description: "MarathonYear custom scalar type",
+  extensions: {},
+  parseValue(value): MarathonYearString {
+    if (typeof value === "string") {
+      if (!isMarathonYearString(value)) {
+        throw new TypeError(
+          "MarathonYearScalar can only parse strings that match the pattern DB00"
+        );
+      }
+      return value;
+    } else {
+      throw new TypeError("MarathonYearScalar can only parse strings");
+    }
+  },
+  serialize(value): string {
+    if (typeof value === "string") {
+      if (!isMarathonYearString(value)) {
+        throw new TypeError(
+          "MarathonYearScalar can only serialize strings that match the pattern"
+        );
+      }
+      return value;
+    } else {
+      throw new TypeError("MarathonYearScalar can only serialize strings");
+    }
+  },
+  parseLiteral(ast): MarathonYearString {
+    if (ast.kind === Kind.STRING) {
+      if (!isMarathonYearString(ast.value)) {
+        throw new TypeError(
+          "MarathonYearScalar can only parse literal string values that match the pattern"
+        );
+      }
+      return ast.value;
+    } else {
+      throw new TypeError(
+        "MarathonYearScalar can only parse literal string values"
+      );
+    }
+  },
+});