Refactored

nrjchnd · May 1, 2021 · b38c8aa · b38c8aa
1 parent 6ae823a
commit b38c8aa
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 13 deletions.
diff --git a/mods/ctl/src/commands/domains/get.ts b/mods/ctl/src/commands/domains/get.ts
@@ -4,7 +4,7 @@ import {CLIError} from "@oclif/errors";
 import {Command} from "@oclif/command";
 import {cli} from "cli-ux";
 import {render} from "prettyjson";
-import moment from "moment";
+const moment = require("moment");
 
 export default class GetCommand extends Command {
   static description = "get information about an existing domain";

diff --git a/mods/ctl/src/commands/domains/list.ts b/mods/ctl/src/commands/domains/list.ts
@@ -5,7 +5,9 @@ import {Command, flags as oclifFlags} from "@oclif/command";
 import inquirer from "inquirer";
 import {CommonPB} from "@fonos/domains";
 import {Domain} from "@fonos/domains/src/types";
-import Table from "easy-table";
+
+// Using import will cause: Error: easy_table_1.default is not a constructor
+const Table = require("easy-table");
 
 export default class ListCommand extends Command {
   static description = `list registered domains

diff --git a/mods/ctl/src/commands/domains/update.ts b/mods/ctl/src/commands/domains/update.ts
@@ -3,7 +3,7 @@ import Domains from "@fonos/domains";
 import {CLIError} from "@oclif/errors";
 import {Command} from "@oclif/command";
 import {cli} from "cli-ux";
-import inquirer from "inquirer";
+const inquirer = require("inquirer");
 
 export default class UpdateCommand extends Command {
   static args = [{name: "ref"}];

diff --git a/mods/domains/src/service/domains.ts b/mods/domains/src/service/domains.ts
@@ -21,18 +21,25 @@ import {
   ResourceServer,
   getAccessKeyId,
   Kind,
-  ResourceBuilder
+  ResourceBuilder,
+  updateResource
 } from "@fonos/core";
 import unmarshalDomain from "./decoder";
+import decoder from "./decoder";
 
 class DomainsServer extends ResourceServer implements IDomainsServer {
   async listDomains(
     call: grpc.ServerUnaryCall<ListDomainsRequest>,
     callback: grpc.sendUnaryData<ListDomainsResponse>
   ) {
-    // const response = super.listResources(Kind.DOMAIN, call);
-    // const 
-    // callback(null, await unmarshalDomain(response))
+    const result = await super.listResources(Kind.DOMAIN, call);
+    const response = new ListDomainsResponse();
+    if (result.resources) {
+      const domains = result.resources.map((resource) => decoder(resource));
+      response.setNextPageToken(result.nextPageToken + "");
+      response.setDomainsList(domains);
+    }
+    callback(null, response);
   }
 
   async createDomain(
@@ -79,10 +86,13 @@ class DomainsServer extends ResourceServer implements IDomainsServer {
         .withEgressPolicy(domain.getEgressRule(), domain.getEgressNumberRef())
         .withACL(domain.getAccessAllowList(), domain.getAccessDenyList())
         .build();
-      /* callback(
-         null,
-         //await updateResource(getAccessKeyId(call), resource, unmarshalDomain)
-      );*/
+
+      const result = await updateResource({
+        resource,
+        accessKeyId: getAccessKeyId(call)
+      });
+
+      callback(null, decoder(result));
     } catch (e) {
       callback(e, null);
     }
@@ -92,14 +102,24 @@ class DomainsServer extends ResourceServer implements IDomainsServer {
     call: grpc.ServerUnaryCall<GetDomainRequest>,
     callback: grpc.sendUnaryData<Domain>
   ) {
-    super.getResource(Kind.DOMAIN, call);
+    try {
+      const result = await super.getResource(Kind.DOMAIN, call);
+      callback(null, decoder(result));
+    } catch (e) {
+      callback(e, null);
+    }
   }
 
   async deleteDomain(
     call: grpc.ServerUnaryCall<DeleteDomainRequest>,
     callback: grpc.sendUnaryData<Empty>
   ) {
-    super.deleteResource(Kind.DOMAIN, call);
+    try {
+      await super.deleteResource(Kind.DOMAIN, call);
+      callback(null, new Empty());
+    } catch (e) {
+      callback(e, null);
+    }
   }
 }