@memberjunction/server 0.9.238 → 0.9.241

package/dist/resolvers/FileResolver.d.ts

@@ -0,0 +1,21 @@
+import { AppContext, PubSubEngine } from '@memberjunction/server';
+import { CreateFileInput, FileResolver as FileResolverBase, File_ } from '../generated/generated';
+export declare class CreateUploadURLInput {
+    FileID: number;
+}
+export declare class CreateFilePayload {
+    File: File_;
+    UploadUrl: string;
+}
+export declare class FileExt extends File_ {
+    DownloadUrl: string;
+}
+export declare class FileResolver extends FileResolverBase {
+    CreateFile(input: CreateFileInput, { dataSource, userPayload }: AppContext, pubSub: PubSubEngine): Promise<{
+        File: {};
+        UploadUrl: string;
+    }>;
+    DownloadUrl(file: File_, { userPayload }: AppContext): Promise<string>;
+    DeleteFile(ID: number, { dataSource, userPayload }: AppContext, pubSub: PubSubEngine): Promise<{}>;
+}
+//# sourceMappingURL=FileResolver.d.ts.map

package/dist/resolvers/FileResolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FileResolver.d.ts","sourceRoot":"","sources":["../../src/resolvers/FileResolver.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,UAAU,EAUV,YAAY,EAGb,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,YAAY,IAAI,gBAAgB,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAElG,qBACa,oBAAoB;IAE/B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,qBACa,iBAAiB;IAE5B,IAAI,EAAE,KAAK,CAAC;IAEZ,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBACa,OAAQ,SAAQ,KAAK;IAEhC,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,qBACa,YAAa,SAAQ,gBAAgB;IAE1C,UAAU,CACuB,KAAK,EAAE,eAAe,EACpD,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EACpC,MAAM,EAAE,YAAY;;;;IA2B1B,WAAW,CAAS,IAAI,EAAE,KAAK,EAAS,EAAE,WAAW,EAAE,EAAE,UAAU;IAanE,UAAU,CAAuB,EAAE,EAAE,MAAM,EAAS,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,UAAU,EAAY,MAAM,EAAE,YAAY;CAiBlI"}

package/dist/resolvers/FileResolver.js

@@ -0,0 +1,122 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileResolver = exports.FileExt = exports.CreateFilePayload = exports.CreateUploadURLInput = void 0;
+const core_1 = require("@memberjunction/core");
+const server_1 = require("@memberjunction/server");
+const storage_1 = require("@memberjunction/storage");
+const generated_1 = require("../generated/generated");
+let CreateUploadURLInput = class CreateUploadURLInput {
+};
+exports.CreateUploadURLInput = CreateUploadURLInput;
+__decorate([
+    (0, server_1.Field)(() => server_1.Int),
+    __metadata("design:type", Number)
+], CreateUploadURLInput.prototype, "FileID", void 0);
+exports.CreateUploadURLInput = CreateUploadURLInput = __decorate([
+    (0, server_1.InputType)()
+], CreateUploadURLInput);
+let CreateFilePayload = class CreateFilePayload {
+};
+exports.CreateFilePayload = CreateFilePayload;
+__decorate([
+    (0, server_1.Field)(() => generated_1.File_),
+    __metadata("design:type", generated_1.File_)
+], CreateFilePayload.prototype, "File", void 0);
+__decorate([
+    (0, server_1.Field)(() => String),
+    __metadata("design:type", String)
+], CreateFilePayload.prototype, "UploadUrl", void 0);
+exports.CreateFilePayload = CreateFilePayload = __decorate([
+    (0, server_1.ObjectType)()
+], CreateFilePayload);
+let FileExt = class FileExt extends generated_1.File_ {
+};
+exports.FileExt = FileExt;
+__decorate([
+    (0, server_1.Field)(() => String),
+    __metadata("design:type", String)
+], FileExt.prototype, "DownloadUrl", void 0);
+exports.FileExt = FileExt = __decorate([
+    (0, server_1.ObjectType)()
+], FileExt);
+let FileResolver = class FileResolver extends generated_1.FileResolver {
+    async CreateFile(input, { dataSource, userPayload }, pubSub) {
+        const md = new core_1.Metadata();
+        const userInfo = this.GetUserFromPayload(userPayload);
+        const providerEntity = await md.GetEntityObject('File Storage Providers', userInfo);
+        const fileRecord = (await super.CreateFile({ ...input, Status: 'Pending' }, { dataSource, userPayload }, pubSub));
+        if (!fileRecord) {
+            return null;
+        }
+        const { updatedInput, UploadUrl } = await (0, storage_1.createUploadUrl)(providerEntity, fileRecord);
+        const fileEntity = await new core_1.Metadata().GetEntityObject('Files', userInfo);
+        fileEntity.LoadFromData(input);
+        fileEntity.SetMany(updatedInput);
+        await fileEntity.Save();
+        const File = fileEntity.GetAll();
+        return { File, UploadUrl };
+    }
+    async DownloadUrl(file, { userPayload }) {
+        const md = new core_1.Metadata();
+        const providerEntity = await md.GetEntityObject('File Storage Providers', this.GetUserFromPayload(userPayload));
+        const url = await (0, storage_1.createDownloadUrl)(providerEntity, file.ProviderKey ?? file.ID);
+        return url;
+    }
+    async DeleteFile(ID, { dataSource, userPayload }, pubSub) {
+        const md = new core_1.Metadata();
+        const userInfo = this.GetUserFromPayload(userPayload);
+        const entityObject = await md.GetEntityObject('Files', userInfo);
+        await entityObject.Load(ID);
+        if (!entityObject) {
+            return null;
+        }
+        if (entityObject.Status === 'Uploaded') {
+            const providerEntity = await md.GetEntityObject('File Storage Providers', userInfo);
+            await (0, storage_1.deleteObject)(providerEntity, entityObject.ProviderKey ?? entityObject.ID);
+        }
+        return super.DeleteFile(ID, { dataSource, userPayload }, pubSub);
+    }
+};
+exports.FileResolver = FileResolver;
+__decorate([
+    (0, server_1.Mutation)(() => CreateFilePayload),
+    __param(0, (0, server_1.Arg)('input', () => generated_1.CreateFileInput)),
+    __param(1, (0, server_1.Ctx)()),
+    __param(2, (0, server_1.PubSub)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [generated_1.CreateFileInput, Object, server_1.PubSubEngine]),
+    __metadata("design:returntype", Promise)
+], FileResolver.prototype, "CreateFile", null);
+__decorate([
+    (0, server_1.FieldResolver)(() => String),
+    __param(0, (0, server_1.Root)()),
+    __param(1, (0, server_1.Ctx)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [generated_1.File_, Object]),
+    __metadata("design:returntype", Promise)
+], FileResolver.prototype, "DownloadUrl", null);
+__decorate([
+    (0, server_1.Mutation)(() => generated_1.File_),
+    __param(0, (0, server_1.Arg)('ID', () => server_1.Int)),
+    __param(1, (0, server_1.Ctx)()),
+    __param(2, (0, server_1.PubSub)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Number, Object, server_1.PubSubEngine]),
+    __metadata("design:returntype", Promise)
+], FileResolver.prototype, "DeleteFile", null);
+exports.FileResolver = FileResolver = __decorate([
+    (0, server_1.Resolver)(generated_1.File_)
+], FileResolver);
+//# sourceMappingURL=FileResolver.js.map

package/dist/resolvers/FileResolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FileResolver.js","sourceRoot":"","sources":["../../src/resolvers/FileResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAgD;AAEhD,mDAcgC;AAChC,qDAA2F;AAC3F,sDAAkG;AAG3F,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;CAGhC,CAAA;AAHY,oDAAoB;AAE/B;IADC,IAAA,cAAK,EAAC,GAAG,EAAE,CAAC,YAAG,CAAC;;oDACF;+BAFJ,oBAAoB;IADhC,IAAA,kBAAS,GAAE;GACC,oBAAoB,CAGhC;AAGM,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;CAK7B,CAAA;AALY,8CAAiB;AAE5B;IADC,IAAA,cAAK,EAAC,GAAG,EAAE,CAAC,iBAAK,CAAC;8BACb,iBAAK;+CAAC;AAEZ;IADC,IAAA,cAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;oDACF;4BAJP,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;GACA,iBAAiB,CAK7B;AAGM,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,iBAAK;CAGjC,CAAA;AAHY,0BAAO;AAElB;IADC,IAAA,cAAK,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;4CACA;kBAFT,OAAO;IADnB,IAAA,mBAAU,GAAE;GACA,OAAO,CAGnB;AAGM,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,wBAAgB;IAE1C,AAAN,KAAK,CAAC,UAAU,CACuB,KAAsB,EACpD,EAAE,UAAU,EAAE,WAAW,EAAc,EACpC,MAAoB;QAE9B,MAAM,EAAE,GAAG,IAAI,eAAQ,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACtD,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,eAAe,CAA4B,wBAAwB,EAAE,QAAQ,CAAC,CAAC;QAE/G,MAAM,UAAU,GAAG,CAAC,MAAM,KAAK,CAAC,UAAU,CAAC,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,MAAM,CAAC,CAAU,CAAC;QAG3H,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QACd,CAAC;QAGD,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,yBAAe,EAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QAGtF,MAAM,UAAU,GAAe,MAAM,IAAI,eAAQ,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACvF,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QAC/B,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACjC,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;QACxB,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;QAEjC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC7B,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW,CAAS,IAAW,EAAS,EAAE,WAAW,EAAc;QACvE,MAAM,EAAE,GAAG,IAAI,eAAQ,EAAE,CAAC;QAC1B,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,eAAe,CAC7C,wBAAwB,EACxB,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CACrC,CAAC;QAEF,MAAM,GAAG,GAAG,MAAM,IAAA,2BAAiB,EAAC,cAAc,EAAE,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;QAEjF,OAAO,GAAG,CAAC;IACb,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CAAuB,EAAU,EAAS,EAAE,UAAU,EAAE,WAAW,EAAc,EAAY,MAAoB;QAC/H,MAAM,EAAE,GAAG,IAAI,eAAQ,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;QAEtD,MAAM,YAAY,GAAe,MAAM,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC7E,MAAM,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5B,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,YAAY,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YACvC,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,eAAe,CAA4B,wBAAwB,EAAE,QAAQ,CAAC,CAAC;YAC/G,MAAM,IAAA,sBAAY,EAAC,cAAc,EAAE,YAAY,CAAC,WAAW,IAAI,YAAY,CAAC,EAAE,CAAC,CAAC;QAClF,CAAC;QAED,OAAO,KAAK,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;CACF,CAAA;AA9DY,oCAAY;AAEjB;IADL,IAAA,iBAAQ,EAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC;IAE/B,WAAA,IAAA,YAAG,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,2BAAe,CAAC,CAAA;IACnC,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,eAAM,GAAE,CAAA;;qCAFmC,2BAAe,UAEzC,qBAAY;;8CAwB/B;AAGK;IADL,IAAA,sBAAa,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;IACT,WAAA,IAAA,aAAI,GAAE,CAAA;IAAe,WAAA,IAAA,YAAG,GAAE,CAAA;;qCAAb,iBAAK;;+CAUpC;AAGK;IADL,IAAA,iBAAQ,EAAC,GAAG,EAAE,CAAC,iBAAK,CAAC;IACJ,WAAA,IAAA,YAAG,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,YAAG,CAAC,CAAA;IAAc,WAAA,IAAA,YAAG,GAAE,CAAA;IAA2C,WAAA,IAAA,eAAM,GAAE,CAAA;;qDAAS,qBAAY;;8CAgBhI;uBA7DU,YAAY;IADxB,IAAA,iBAAQ,EAAC,iBAAK,CAAC;GACH,YAAY,CA8DxB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memberjunction/server",
-  "version": "0.9.238",
+  "version": "0.9.241",
   "description": "MemberJunction: This project provides API access via GraphQL to the common data store.",
   "main": "dist/index.js",
   "types": "src/index.ts",
@@ -21,16 +21,17 @@
   "dependencies": {
     "@apollo/server": "^4.9.1",
     "@graphql-tools/utils": "^10.0.1",
-    "@memberjunction/ai": "^0.9.160",
-    "@memberjunction/aiengine": "^0.9.58",
-    "@memberjunction/core": "^0.9.172",
-    "@memberjunction/core-entities": "^0.9.157",
-    "@memberjunction/data-context": "^0.9.45",
-    "@memberjunction/data-context-server": "^0.9.41",
-    "@memberjunction/global": "^0.9.153",
-    "@memberjunction/queue": "^0.9.179",
-    "@memberjunction/sqlserver-dataprovider": "^0.9.195",
-    "@memberjunction/skip-types": "^0.9.70",
+    "@memberjunction/ai": "^0.9.162",
+    "@memberjunction/aiengine": "^0.9.61",
+    "@memberjunction/core": "^0.9.175",
+    "@memberjunction/core-entities": "^0.9.160",
+    "@memberjunction/data-context": "^0.9.48",
+    "@memberjunction/data-context-server": "^0.9.44",
+    "@memberjunction/global": "^0.9.155",
+    "@memberjunction/storage": "^0.9.5",
+    "@memberjunction/queue": "^0.9.182",
+    "@memberjunction/sqlserver-dataprovider": "^0.9.198",
+    "@memberjunction/skip-types": "^0.9.73",
     "@types/cors": "^2.8.13",
     "@types/jsonwebtoken": "^8.5.9",
     "@types/node": "^18.11.14",

package/src/context.ts

@@ -110,7 +110,10 @@ export const contextFunction =
     const userPayload = await getUserPayload(bearerToken, sessionId, dataSource, requestDomain?.hostname ? requestDomain.hostname : undefined);
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    console.log((req as any).body?.operationName);
+    const operationName: string| undefined = (req as any).body?.operationName;
+    if (operationName !== 'IntrospectionQuery') {
+      console.log({ operationName });
+    } 
 
     return { dataSource, userPayload };
   };

package/src/generated/generated.ts

@@ -2,7 +2,7 @@
 * ALL ENTITIES - TypeGraphQL Type Class Definition - AUTO GENERATED FILE
 * Generated Entities and Resolvers for Server
 * 
-* GENERATED: 3/18/2024, 2:22:24 PM
+* GENERATED: 3/21/2024, 5:44:24 PM
 * 
 *   >>> DO NOT MODIFY THIS FILE!!!!!!!!!!!!
 *   >>> YOUR CHANGES WILL BE OVERWRITTEN
@@ -4012,6 +4012,9 @@ export class EntityRelationship_ {
     @Field(() => Int) 
     EntityID: number;
       
+    @Field(() => Int, {description: 'Used for display order in generated forms and in other places in the UI where relationships for an entity are shown'}) 
+    Sequence: number;
+      
     @Field(() => Int) 
     RelatedEntityID: number;
       
@@ -4117,6 +4120,9 @@ export class CreateEntityRelationshipInput {
     @Field(() => Int)
     EntityID: number;
 
+    @Field(() => Int)
+    Sequence: number;
+
     @Field(() => Int)
     RelatedEntityID: number;
 
@@ -4163,6 +4169,9 @@ export class UpdateEntityRelationshipInput {
     @Field(() => Int)
     EntityID: number;
 
+    @Field(() => Int)
+    Sequence: number;
+
     @Field(() => Int)
     RelatedEntityID: number;
 
@@ -14619,8 +14628,8 @@ export class Query_ {
     @Field({nullable: true}) 
     Description?: string;
       
-    @Field(() => Int) 
-    CategoryID: number;
+    @Field(() => Int, {nullable: true}) 
+    CategoryID?: number;
       
     @Field({nullable: true}) 
     SQL?: string;
@@ -14646,9 +14655,9 @@ export class Query_ {
     @MaxLength(8)
     UpdatedAt: Date;
       
-    @Field() 
+    @Field({nullable: true}) 
     @MaxLength(100)
-    Category: string;
+    Category?: string;
     
     @Field(() => [mj_core_schema_server_object_types.QueryField_])
     QueryFieldsArray: mj_core_schema_server_object_types.QueryField_[]; // Link to QueryFields
@@ -14672,7 +14681,7 @@ export class CreateQueryInput {
     @Field({ nullable: true })
     Description: string;
 
-    @Field(() => Int)
+    @Field(() => Int, { nullable: true })
     CategoryID: number;
 
     @Field({ nullable: true })
@@ -14706,7 +14715,7 @@ export class UpdateQueryInput {
     @Field({ nullable: true })
     Description: string;
 
-    @Field(() => Int)
+    @Field(() => Int, { nullable: true })
     CategoryID: number;
 
     @Field({ nullable: true })
@@ -17161,8 +17170,8 @@ export class ReportCategory_ {
     @Field({nullable: true}) 
     Description?: string;
       
-    @Field(() => Int) 
-    ParentID: number;
+    @Field(() => Int, {nullable: true}) 
+    ParentID?: number;
       
     @Field() 
     @MaxLength(8)
@@ -17172,9 +17181,9 @@ export class ReportCategory_ {
     @MaxLength(8)
     UpdatedAt: Date;
       
-    @Field() 
+    @Field({nullable: true}) 
     @MaxLength(200)
-    Parent: string;
+    Parent?: string;
     
     @Field(() => [mj_core_schema_server_object_types.ReportCategory_])
     ReportCategoriesArray: mj_core_schema_server_object_types.ReportCategory_[]; // Link to ReportCategories
@@ -17195,7 +17204,7 @@ export class CreateReportCategoryInput {
     @Field({ nullable: true })
     Description: string;
 
-    @Field(() => Int)
+    @Field(() => Int, { nullable: true })
     ParentID: number;
 }
 
@@ -17214,7 +17223,7 @@ export class UpdateReportCategoryInput {
     @Field({ nullable: true })
     Description: string;
 
-    @Field(() => Int)
+    @Field(() => Int, { nullable: true })
     ParentID: number;
 }
 
@@ -17825,6 +17834,32 @@ export class FileResolver extends ResolverBase {
         const i = input, d = dataSource; // prevent error
     }
 
+    @Mutation(() => File_)
+    async DeleteFile(@Arg('ID', () => Int) ID: number, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+        if (await this.BeforeDelete(dataSource, ID)) { // fire event and proceed if it wasn't cancelled
+            const entityObject = <FileEntity>await new Metadata().GetEntityObject('Files', this.GetUserFromPayload(userPayload));
+            await entityObject.Load(ID);
+            const returnValue = entityObject.GetAll(); // grab the values before we delete so we can return last state before delete if we are successful.
+            if (await entityObject.Delete()) {
+                await this.AfterDelete(dataSource, ID); // fire event
+                return returnValue;
+            }
+            else 
+                return null; // delete failed, this will cause an exception
+        }
+        else
+            return null; // BeforeDelete canceled the operation, this will cause an exception
+    }
+
+    // Before/After UPDATE Event Hooks for Sub-Classes to Override
+    protected async BeforeDelete(dataSource: DataSource, ID: number): Promise<boolean> {
+        const i = ID, d = dataSource; // prevent error;
+        return true;
+    }
+    protected async AfterDelete(dataSource: DataSource, ID: number) {
+        const i = ID, d = dataSource; // prevent error
+    }
+
 }
 
 //****************************************************************************

package/src/resolvers/FileResolver.ts

@@ -0,0 +1,104 @@
+import { Metadata } from '@memberjunction/core';
+import { FileEntity, FileStorageProviderEntity } from '@memberjunction/core-entities';
+import {
+  AppContext,
+  Arg,
+  Ctx,
+  Field,
+  FieldResolver,
+  InputType,
+  Int,
+  Mutation,
+  ObjectType,
+  PubSub,
+  PubSubEngine,
+  Resolver,
+  Root,
+} from '@memberjunction/server';
+import { createDownloadUrl, createUploadUrl, deleteObject } from '@memberjunction/storage';
+import { CreateFileInput, FileResolver as FileResolverBase, File_ } from '../generated/generated';
+
+@InputType()
+export class CreateUploadURLInput {
+  @Field(() => Int)
+  FileID: number;
+}
+
+@ObjectType()
+export class CreateFilePayload {
+  @Field(() => File_)
+  File: File_;
+  @Field(() => String)
+  UploadUrl: string;
+}
+
+@ObjectType()
+export class FileExt extends File_ {
+  @Field(() => String)
+  DownloadUrl: string;
+}
+
+@Resolver(File_)
+export class FileResolver extends FileResolverBase {
+  @Mutation(() => CreateFilePayload)
+  async CreateFile(
+    @Arg('input', () => CreateFileInput) input: CreateFileInput,
+    @Ctx() { dataSource, userPayload }: AppContext,
+    @PubSub() pubSub: PubSubEngine
+  ) {
+    const md = new Metadata();
+    const userInfo = this.GetUserFromPayload(userPayload);
+    const providerEntity = await md.GetEntityObject<FileStorageProviderEntity>('File Storage Providers', userInfo);
+
+    const fileRecord = (await super.CreateFile({ ...input, Status: 'Pending' }, { dataSource, userPayload }, pubSub)) as File_;
+
+    // If there's a problem creating the file record, the base resolver will return null
+    if (!fileRecord) {
+      return null;
+    }
+
+    // Create the upload URL and get the record updates (provider key, content type, etc)
+    const { updatedInput, UploadUrl } = await createUploadUrl(providerEntity, fileRecord);
+
+    // Save the file record with the updated input
+    const fileEntity = <FileEntity>await new Metadata().GetEntityObject('Files', userInfo);
+    fileEntity.LoadFromData(input);
+    fileEntity.SetMany(updatedInput);
+    await fileEntity.Save();
+    const File = fileEntity.GetAll();
+
+    return { File, UploadUrl };
+  }
+
+  @FieldResolver(() => String)
+  async DownloadUrl(@Root() file: File_, @Ctx() { userPayload }: AppContext) {
+    const md = new Metadata();
+    const providerEntity = await md.GetEntityObject<FileStorageProviderEntity>(
+      'File Storage Providers',
+      this.GetUserFromPayload(userPayload)
+    );
+
+    const url = await createDownloadUrl(providerEntity, file.ProviderKey ?? file.ID);
+
+    return url;
+  }
+
+  @Mutation(() => File_)
+  async DeleteFile(@Arg('ID', () => Int) ID: number, @Ctx() { dataSource, userPayload }: AppContext, @PubSub() pubSub: PubSubEngine) {
+    const md = new Metadata();
+    const userInfo = this.GetUserFromPayload(userPayload);
+
+    const entityObject = <FileEntity>await md.GetEntityObject('Files', userInfo);
+    await entityObject.Load(ID);
+    if (!entityObject) {
+      return null;
+    }
+
+    if (entityObject.Status === 'Uploaded') { 
+      const providerEntity = await md.GetEntityObject<FileStorageProviderEntity>('File Storage Providers', userInfo);
+      await deleteObject(providerEntity, entityObject.ProviderKey ?? entityObject.ID);
+    }
+
+    return super.DeleteFile(ID, { dataSource, userPayload }, pubSub);
+  }
+}