Moved secured enum wrappers to their enum file

Author: CarsonF

src/components/partner/dto/partner.dto.ts

@@ -10,7 +10,6 @@ import {
   Secured,
   SecuredBoolean,
   SecuredDateNullable,
-  SecuredEnumList,
   SecuredProperty,
   SecuredProps,
   SecuredStringNullable,
@@ -19,7 +18,7 @@ import {
 } from '~/common';
 import { e } from '~/core/edgedb';
 import { LinkTo, RegisterResource } from '~/core/resources';
-import { FinancialReportingType } from '../../partnership/dto';
+import { SecuredFinancialReportingTypes } from '../../partnership/dto';
 import { Pinnable } from '../../pin/dto';
 import { Postable } from '../../post/dto';
 import { IProject } from '../../project/dto';
@@ -30,13 +29,6 @@ const Interfaces: Type<Resource & Pinnable & Postable> = IntersectionType(
   IntersectionType(Pinnable, Postable),
 );
 
-@ObjectType({
-  description: SecuredEnumList.descriptionFor('financial reporting types'),
-})
-export abstract class SecuredFinancialReportingTypes extends SecuredEnumList(
-  FinancialReportingType,
-) {}
-
 @RegisterResource({ db: e.Partner })
 @ObjectType({
   implements: [Resource, Pinnable, Postable],

src/components/partnership/dto/financial-reporting-type.enum.ts

@@ -1,7 +1,23 @@
-import { EnumType, makeEnum } from '~/common';
+import { ObjectType } from '@nestjs/graphql';
+import { EnumType, makeEnum, SecuredEnum, SecuredEnumList } from '~/common';
 
 export type FinancialReportingType = EnumType<typeof FinancialReportingType>;
 export const FinancialReportingType = makeEnum({
   name: 'FinancialReportingType',
   values: ['Funded', 'FieldEngaged', 'Hybrid'],
 });
+
+@ObjectType({
+  description: SecuredEnumList.descriptionFor('financial reporting types'),
+})
+export abstract class SecuredFinancialReportingTypes extends SecuredEnumList(
+  FinancialReportingType,
+) {}
+
+@ObjectType({
+  description: SecuredEnum.descriptionFor('financial reporting type'),
+})
+export abstract class SecuredFinancialReportingType extends SecuredEnum(
+  FinancialReportingType,
+  { nullable: true },
+) {}

src/components/partnership/dto/partnership-agreement-status.enum.ts

@@ -1,4 +1,5 @@
-import { EnumType, makeEnum } from '~/common';
+import { ObjectType } from '@nestjs/graphql';
+import { EnumType, makeEnum, SecuredEnum } from '~/common';
 
 export type PartnershipAgreementStatus = EnumType<
   typeof PartnershipAgreementStatus
@@ -7,3 +8,10 @@ export const PartnershipAgreementStatus = makeEnum({
   name: 'PartnershipAgreementStatus',
   values: ['NotAttached', 'AwaitingSignature', 'Signed'],
 });
+
+@ObjectType({
+  description: SecuredEnum.descriptionFor('a partnership agreement status'),
+})
+export abstract class SecuredPartnershipAgreementStatus extends SecuredEnum(
+  PartnershipAgreementStatus,
+) {}

src/components/partnership/dto/partnership.dto.ts

@@ -8,7 +8,6 @@ import {
   Secured,
   SecuredBoolean,
   SecuredDateNullable,
-  SecuredEnum,
   SecuredProps,
   Sensitivity,
   SensitivityField,
@@ -20,23 +19,8 @@ import { ChangesetAware } from '../../changeset/dto';
 import { Organization } from '../../organization/dto';
 import { SecuredPartnerTypes } from '../../partner/dto';
 import { IProject } from '../../project/dto';
-import { FinancialReportingType } from './financial-reporting-type.enum';
-import { PartnershipAgreementStatus } from './partnership-agreement-status.enum';
-
-@ObjectType({
-  description: SecuredEnum.descriptionFor('a partnership agreement status'),
-})
-export abstract class SecuredPartnershipAgreementStatus extends SecuredEnum(
-  PartnershipAgreementStatus,
-) {}
-
-@ObjectType({
-  description: SecuredEnum.descriptionFor('partnership funding type'),
-})
-export abstract class SecuredFinancialReportingType extends SecuredEnum(
-  FinancialReportingType,
-  { nullable: true },
-) {}
+import { SecuredFinancialReportingType } from './financial-reporting-type.enum';
+import { SecuredPartnershipAgreementStatus } from './partnership-agreement-status.enum';
 
 @RegisterResource({ db: e.Partnership })
 @ObjectType({

src/components/user/dto/user-status.enum.ts

@@ -1,7 +1,13 @@
-import { EnumType, makeEnum } from '~/common';
+import { ObjectType } from '@nestjs/graphql';
+import { EnumType, makeEnum, SecuredEnum, SecuredProperty } from '~/common';
 
 export type UserStatus = EnumType<typeof UserStatus>;
 export const UserStatus = makeEnum({
   name: 'UserStatus',
   values: ['Active', 'Disabled'],
 });
+
+@ObjectType({
+  description: SecuredProperty.descriptionFor('a user status'),
+})
+export abstract class SecuredUserStatus extends SecuredEnum(UserStatus) {}

src/components/user/dto/user.dto.ts

@@ -7,7 +7,6 @@ import {
   NameField,
   Resource,
   ResourceRelationsShape,
-  SecuredEnum,
   SecuredProperty,
   SecuredProps,
   SecuredRoles,
@@ -24,18 +23,13 @@ import { IProject as Project } from '../../project/dto';
 import { Education } from '../education/dto';
 import { Unavailability } from '../unavailability/dto';
 import { KnownLanguage } from './known-language.dto';
-import { UserStatus } from './user-status.enum';
+import { SecuredUserStatus } from './user-status.enum';
 
 const PinnableResource: Type<Resource & Pinnable> = IntersectionType(
   Resource,
   Pinnable,
 );
 
-@ObjectType({
-  description: SecuredProperty.descriptionFor('a user status'),
-})
-export abstract class SecuredUserStatus extends SecuredEnum(UserStatus) {}
-
 @RegisterResource({ db: e.User })
 @ObjectType({
   implements: [Resource, Pinnable],