Switch to a more class-like global domain/org name for generation con…

…venience
foobara · Dec 23, 2023 · f2a4eda · f2a4eda
1 parent 51356cd
commit f2a4eda
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 6 deletions.
diff --git a/src/remote_generator/services/base_generator.rb b/src/remote_generator/services/base_generator.rb
@@ -199,11 +199,11 @@ def ts_instance_path
         def domain_path
           path = []
 
-          if organization_name != "global_organization"
+          if organization_name != "GlobalOrganization"
             path << organization_name
           end
 
-          if domain_name != "global_domain"
+          if domain_name != "GlobalDomain"
             path << domain_name
           end
 

diff --git a/src/remote_generator/services/domain_generator.rb b/src/remote_generator/services/domain_generator.rb
@@ -29,6 +29,26 @@ def entity_generators
         def dependencies
           [*command_generators, *entity_generators, *organization]
         end
+
+        def domain_name
+          s = super
+
+          if s == "global_domain"
+            s = "GlobalDomain"
+          end
+
+          s
+        end
+
+        def organization_name
+          s = super
+
+          if s == "global_organization"
+            s = "GlobalOrganization"
+          end
+
+          s
+        end
       end
     end
   end

diff --git a/src/remote_generator/services/organization_generator.rb b/src/remote_generator/services/organization_generator.rb
@@ -23,6 +23,16 @@ def domain_generators
         def dependencies
           domain_generators
         end
+
+        def organization_name
+          s = super
+
+          if s == "global_organization"
+            s = "GlobalOrganization"
+          end
+
+          s
+        end
       end
     end
   end

diff --git a/src/remote_generator/templates/base/Domain.ts b/src/remote_generator/templates/base/Domain.ts
@@ -10,6 +10,8 @@ export class Domain {
     this.organizationName = organizationName
     this.domainName = domainName
     this.isGlobal = isGlobal
+
+    this.organization.addDomain(this)
   }
 
   get urlBase(): string {
@@ -25,4 +27,4 @@ export class Domain {
   }
 }
 
-export const globalDomain = new Domain("global_organization", "global_domain", true)
+export const globalDomain = new Domain("GlobalOrganization", "GlobalDomain", true)
diff --git a/src/remote_generator/templates/base/Organization.ts b/src/remote_generator/templates/base/Organization.ts
@@ -1,6 +1,6 @@
 import {Domain} from "./Domain";
 
-export abstract class Organization {
+export class Organization {
   static all: {[organizationName: string]: Organization} = {}
   static forName(organizationName: string): Organization {
     return this.all[organizationName]
@@ -17,7 +17,13 @@ export abstract class Organization {
     Organization.all[organizationName] = this
   }
 
-  abstract domainForName(domainName: string): Domain
+  domainForName(domainName: string): Domain {
+    return this.domainsByName[domainName]
+  }
+
+  addDomain(domain: Domain) {
+    this.domainsByName[domain.domainName] = domain
+  }
 
   get urlBase(): string {
     let base = this._urlBase
@@ -36,7 +42,7 @@ export abstract class Organization {
 
 }
 
-export const globalOrganization = new Organization("global_organization", true)
+export const globalOrganization = new Organization("GlobalOrganization", true)
 
 const globalUrlBase = process.env.REACT_APP_FOOBARA_GLOBAL_URL_BASE