fix test in example

broken by #1786
lolopinto · Mar 3, 2024 · bffc6c7 · bffc6c7
1 parent 595b436
commit bffc6c7
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 52 deletions.
diff --git a/examples/simple/src/ent/auth_code/actions/create_auth_code_action.ts b/examples/simple/src/ent/auth_code/actions/create_auth_code_action.ts
@@ -114,18 +114,18 @@ export default class CreateAuthCodeAction extends CreateAuthCodeActionBase {
             FakeComms.send({
               to: input.emailAddress,
               mode: Mode.EMAIL,
-              from: "[email protected]",
-              subject: "auth code",
-              body: `your auth code is ${input.code}`,
+              from: input.from ?? "[email protected]",
+              subject: input.subject ?? "auth code",
+              body: input.body ?? `your auth code is ${input.code}`,
             });
           }
           if (input.phoneNumber) {
             // send sms
             FakeComms.send({
               to: input.phoneNumber,
               mode: Mode.SMS,
-              from: "42423",
-              body: `your auth code is ${input.code}`,
+              from: input.from ?? "42423",
+              body: input.body ?? `your auth code is ${input.code}`,
             });
           }
         },

diff --git a/examples/simple/src/ent/generated/auth_code/actions/create_auth_code_action_base.ts b/examples/simple/src/ent/generated/auth_code/actions/create_auth_code_action_base.ts
diff --git a/examples/simple/src/ent/user/actions/edit_email_address_action.ts b/examples/simple/src/ent/user/actions/edit_email_address_action.ts
@@ -4,13 +4,12 @@ import {
 } from "../../generated/user/actions/edit_email_address_action_base";
 import { UserBuilder } from "../../generated/user/actions/user_builder";
 import CreateAuthCodeAction from "../../auth_code/actions/create_auth_code_action";
-import { FakeComms, Mode } from "@snowtop/ent/testutils/fake_comms";
 import { User } from "../..";
 import { EditUserPrivacy } from "./edit_user_privacy";
 
 export { EditEmailAddressInput };
 import { ExampleViewer } from "../../../viewer/viewer";
-import { Validator, Trigger, Observer } from "@snowtop/ent/action";
+import { Validator, Trigger } from "@snowtop/ent/action";
 
 class NewAuthCode {
   private code: string = "";
@@ -27,25 +26,18 @@ class NewAuthCode {
   }
 
   changeset(builder: UserBuilder, input: EditEmailAddressInput) {
+    const link = `https://website/confirm?email=${
+      input.newEmail
+    }&code=${this.getCode()}`;
+
     return CreateAuthCodeAction.create(builder.viewer, {
       emailAddress: input.newEmail,
       userId: builder.viewer.viewerID!,
       code: this.getCode(),
-    }).changeset();
-  }
-
-  observe(_builder: UserBuilder, input: EditEmailAddressInput) {
-    let link = `https://website/confirm?email=${
-      input.newEmail
-    }&code=${this.getCode()}`;
-
-    FakeComms.send({
-      to: input.newEmail,
-      mode: Mode.EMAIL,
       subject: "confirm email",
       from: "[email protected]",
       body: link,
-    });
+    }).changeset();
   }
 }
 
@@ -82,16 +74,6 @@ export default class EditEmailAddressAction extends EditEmailAddressActionBase {
     return [this.generateNewCode];
   }
 
-  getObservers(): Observer<
-    User,
-    UserBuilder<EditEmailAddressInput, User>,
-    ExampleViewer,
-    EditEmailAddressInput,
-    User
-  >[] {
-    return [this.generateNewCode];
-  }
-
   getPrivacyPolicy() {
     return EditUserPrivacy;
   }

diff --git a/examples/simple/src/ent/user/actions/edit_phone_number_action.ts b/examples/simple/src/ent/user/actions/edit_phone_number_action.ts
@@ -1,4 +1,3 @@
-import { FakeComms, Mode } from "@snowtop/ent/testutils/fake_comms";
 import CreateAuthCodeAction from "../../auth_code/actions/create_auth_code_action";
 import {
   EditPhoneNumberActionBase,
@@ -10,7 +9,7 @@ import { EditUserPrivacy } from "./edit_user_privacy";
 
 export { EditPhoneNumberInput };
 import { ExampleViewer } from "../../../viewer/viewer";
-import { Validator, Trigger, Observer } from "@snowtop/ent/action";
+import { Validator, Trigger } from "@snowtop/ent/action";
 
 class NewAuthCode {
   private code: string = "";
@@ -27,22 +26,15 @@ class NewAuthCode {
   }
 
   changeset(builder: UserBuilder, input: EditPhoneNumberInput) {
+    const body = `your new code is ${this.getCode()}`;
+
     return CreateAuthCodeAction.create(builder.viewer, {
       phoneNumber: input.newPhoneNumber,
       userId: builder.viewer.viewerID!,
       code: this.getCode(),
-    }).changeset();
-  }
-
-  observe(_builder: UserBuilder, input: EditPhoneNumberInput) {
-    let body = `your new code is ${this.getCode()}`;
-
-    FakeComms.send({
-      to: input.newPhoneNumber,
-      mode: Mode.SMS,
-      from: "42423",
       body,
-    });
+      from: "42423",
+    }).changeset();
   }
 }
 
@@ -81,16 +73,6 @@ export default class EditPhoneNumberAction extends EditPhoneNumberActionBase {
     return [this.generateNewCode];
   }
 
-  getObservers(): Observer<
-    User,
-    UserBuilder<EditPhoneNumberInput, User>,
-    ExampleViewer,
-    EditPhoneNumberInput,
-    User
-  >[] {
-    return [this.generateNewCode];
-  }
-
   getPrivacyPolicy() {
     return EditUserPrivacy;
   }

diff --git a/examples/simple/src/schema/auth_code_schema.ts b/examples/simple/src/schema/auth_code_schema.ts
@@ -24,6 +24,23 @@ const AuthCodeSchema = new EntSchema({
   actions: [
     {
       operation: ActionOperation.Create,
+      actionOnlyFields: [
+        {
+          name: "from",
+          type: "String",
+          optional: true,
+        },
+        {
+          name: "subject",
+          type: "String",
+          optional: true,
+        },
+        {
+          name: "body",
+          type: "String",
+          optional: true,
+        },
+      ],
     },
     {
       operation: ActionOperation.Delete,