feat: move service controllers to api gateway

README.md

@@ -1 +0,0 @@
-Should we have a single api gateway that has all the controllers which then calls the Restate services?

accounting-service/src/accounting.service.ts

@@ -10,9 +10,7 @@ import { AccountRepository } from './account.repository.js';
 
 @restate.service<AccountingServiceApi>()
 export class AccountingService implements AccountingServiceHandlers {
-  constructor(
-    private readonly accountRepository: AccountRepository,
-  ) {}
+  constructor(private readonly accountRepository: AccountRepository) {}
 
   // @ts-ignore
   @(restate.kafka<KafkaConsumerTopic>().handler())

api-gateway/.env

@@ -0,0 +1,2 @@
+# Framework
+SERVER_PORT=3000

api-gateway/.eslintrc.json

@@ -0,0 +1,18 @@
+{
+  "extends": ["../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}

api-gateway/project.json

@@ -0,0 +1,100 @@
+{
+  "name": "api-gateway",
+  "$schema": "../node_modules/nx/schemas/project-schema.json",
+  "projectType": "application",
+  "prefix": "ftgo",
+  "sourceRoot": "api-gateway/src",
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@nx/vite:build",
+      "outputs": ["{options.outputPath}"],
+      "defaultConfiguration": "development",
+      "options": {
+        "outputPath": "dist/api-gateway",
+        "ssr": "src/main.ts",
+        "outputFileName": "main.mjs"
+      },
+      "configurations": {
+        "development": {
+          "mode": "development"
+        },
+        "production": {
+          "mode": "production"
+        }
+      }
+    },
+    "serve": {
+      "executor": "@nx/js:node",
+      "defaultConfiguration": "development",
+      "options": {
+        "buildTarget": "api-gateway:build",
+        "watch": false
+      },
+      "configurations": {
+        "development": {
+          "buildTarget": "api-gateway:build:development",
+          "args": ["api-gateway:start"],
+          "watch": true
+        },
+        "production": {
+          "buildTarget": "api-gateway:build:production"
+        },
+        "staging": {
+          "buildTarget": "api-gateway:build:staging"
+        }
+      }
+    },
+    "container": {
+      "executor": "@nx-tools/nx-container:build",
+      "dependsOn": ["build"],
+      "options": {
+        "engine": "docker",
+        "push": true,
+        "cache-from": ["type=gha"],
+        "cache-to": ["type=gha,mode=max"],
+        "metadata": {
+          "images": ["ghcr.io/zapxme/api-gateway"],
+          "tags": [
+            "type=schedule",
+            "type=ref,event=branch",
+            "type=ref,event=tag",
+            "type=ref,event=pr",
+            "type=sha,prefix=sha-"
+          ]
+        }
+      }
+    },
+    "create-migration": {
+      "executor": "@nx/js:node",
+      "defaultConfiguration": "development",
+      "options": {
+        "buildTarget": "api-gateway:build",
+        "args": [
+          "migration:create",
+          "--migrationDir",
+          "api-gateway/src/migrations"
+        ],
+        "watch": false
+      },
+      "configurations": {
+        "development": {
+          "buildTarget": "api-gateway:build:development"
+        },
+        "production": {
+          "buildTarget": "api-gateway:build:production"
+        },
+        "staging": {
+          "buildTarget": "api-gateway:build:staging"
+        }
+      }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint"
+    },
+    "test": {
+      "executor": "@nx/vite:test",
+      "outputs": ["{projectRoot}/coverage"]
+    }
+  }
+}

api-gateway/src/accounting/accounting.controller.ts

@@ -0,0 +1,4 @@
+import { http } from '@deepkit/http';
+
+@http.controller('accounting')
+export class AccountingController {}

api-gateway/src/accounting/accounting.module.ts

@@ -0,0 +1,10 @@
+import { createModule } from '@deepkit/app';
+
+import { provideAccountingServiceApi } from '@ftgo/accounting-service-api';
+
+import { AccountingController } from './accounting.controller.js';
+
+export class AccountingModule extends createModule({
+  controllers: [AccountingController],
+  providers: [provideAccountingServiceApi()],
+}) {}

api-gateway/src/config.ts

@@ -0,0 +1,7 @@
+import { RestateConfig } from 'deepkit-restate';
+import { FrameworkConfig } from '@deepkit/framework';
+
+export class ApiGatewayConfig {
+  readonly restate: RestateConfig;
+  readonly server: FrameworkConfig = new FrameworkConfig();
+}

consumer-service/src/consumer.controller.ts → api-gateway/src/consumer/consumer.controller.ts

@@ -1,4 +1,4 @@
 import { http } from '@deepkit/http';
 
-@http.controller('')
+@http.controller('consumer')
 export class ConsumerController {}

api-gateway/src/consumer/consumer.module.ts

@@ -0,0 +1,10 @@
+import { createModule } from '@deepkit/app';
+
+import { provideConsumerServiceApi } from '@ftgo/consumer-service-api';
+
+import { ConsumerController } from './consumer.controller.js';
+
+export class ConsumerModule extends createModule({
+  controllers: [ConsumerController],
+  providers: [provideConsumerServiceApi()],
+}) {}

delivery-service/src/delivery.controller.ts → api-gateway/src/delivery/delivery.controller.ts

@@ -1,4 +1,4 @@
 import { http } from '@deepkit/http';
 
-@http.controller('')
+@http.controller('delivery')
 export class DeliveryController {}

api-gateway/src/delivery/delivery.module.ts

@@ -0,0 +1,10 @@
+import { createModule } from '@deepkit/app';
+
+import { provideDeliveryServiceApi } from '@ftgo/delivery-service-api';
+
+import { DeliveryController } from './delivery.controller.js';
+
+export class DeliveryModule extends createModule({
+  controllers: [DeliveryController],
+  providers: [provideDeliveryServiceApi()],
+}) {}

kitchen-service/src/kitchen.controller.ts → api-gateway/src/kitchen/kitchen.controller.ts

@@ -1,4 +1,4 @@
 import { http } from '@deepkit/http';
 
-@http.controller('')
+@http.controller('kitchen')
 export class KitchenController {}

api-gateway/src/kitchen/kitchen.module.ts

@@ -0,0 +1,10 @@
+import { createModule } from '@deepkit/app';
+
+import { provideKitchenServiceApi } from '@ftgo/kitchen-service-api';
+
+import { KitchenController } from './kitchen.controller.js';
+
+export class KitchenModule extends createModule({
+  controllers: [KitchenController],
+  providers: [provideKitchenServiceApi()],
+}) {}

api-gateway/src/main.ts

@@ -0,0 +1,36 @@
+import { App } from '@deepkit/app';
+import { FrameworkModule } from '@deepkit/framework';
+import { RestateModule } from 'deepkit-restate';
+
+import { ApiGatewayConfig } from './config.js';
+import { AccountingModule } from './accounting/accounting.module.js';
+import { ConsumerModule } from './consumer/consumer.module.js';
+import { DeliveryModule } from './delivery/delivery.module.js';
+import { KitchenModule } from './kitchen/kitchen.module.js';
+import { OrderModule } from './order/order.module.js';
+import { RestaurantModule } from './restaurant/restaurant.module.js';
+
+void new App({
+  config: ApiGatewayConfig,
+  imports: [
+    new FrameworkModule(),
+    new RestateModule(),
+    new AccountingModule(),
+    new ConsumerModule(),
+    new DeliveryModule(),
+    new KitchenModule(),
+    new OrderModule(),
+    new RestateModule(),
+    new RestaurantModule(),
+  ],
+  controllers: [],
+})
+  .setup((module, config: ApiGatewayConfig) => {
+    module.getImportedModuleByClass(FrameworkModule).configure(config.server);
+
+    module.getImportedModuleByClass(RestateModule).configure({
+      ingress: config.restate.ingress,
+    });
+  })
+  .loadConfigFromEnv({ prefix: '' })
+  .run();

order-service/src/order.controller.ts → api-gateway/src/order/order.controller.ts

@@ -1,4 +1,4 @@
 import { http } from '@deepkit/http';
 
-@http.controller('')
+@http.controller('order')
 export class OrderController {}

api-gateway/src/order/order.module.ts

@@ -0,0 +1,10 @@
+import { createModule } from '@deepkit/app';
+
+import { provideOrderServiceApi } from '@ftgo/order-service-api';
+
+import { OrderController } from './order.controller.js';
+
+export class OrderModule extends createModule({
+  controllers: [OrderController],
+  providers: [provideOrderServiceApi()],
+}) {}

restaurant-service/src/restaurant.controller.ts → api-gateway/src/restaurant/restaurant.controller.ts

@@ -4,22 +4,21 @@ import { RestateClient } from 'deepkit-restate';
 import {
   CreateRestaurantRequest,
   CreateRestaurantResponse,
-  Restaurant,
   RestaurantServiceApi,
 } from '@ftgo/restaurant-service-api';
 
-@http.controller('')
+@http.controller('restaurant')
 export class RestaurantController {
   constructor(
     private readonly service: RestaurantServiceApi,
-    private readonly restate: RestateClient,
+    private readonly client: RestateClient,
   ) {}
 
   @http.POST('create')
   async create(
     request: CreateRestaurantRequest,
   ): Promise<CreateRestaurantResponse> {
-    const restaurant = await this.restate.rpc(this.service.create(request));
+    const restaurant = await this.client.rpc(this.service.create(request));
     return { id: restaurant.id };
   }
 }

api-gateway/src/restaurant/restaurant.module.ts

@@ -0,0 +1,10 @@
+import { createModule } from '@deepkit/app';
+
+import { provideRestaurantServiceApi } from '@ftgo/restaurant-service-api';
+
+import { RestaurantController } from './restaurant.controller.js';
+
+export class RestaurantModule extends createModule({
+  controllers: [RestaurantController],
+  providers: [provideRestaurantServiceApi()],
+}) {}

api-gateway/tsconfig.app.json

@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../dist/out-tsc",
+    "types": []
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["src/**/*.test.ts", "src/**/*.spec.ts"]
+}

api-gateway/tsconfig.json

@@ -0,0 +1,17 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "strictPropertyInitialization": false,
+    "types": ["vite/client"]
+  },
+  "files": [],
+  "include": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
+}

api-gateway/tsconfig.spec.json

@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../dist/out-tsc",
+    "types": ["vitest/globals"]
+  },
+  "include": ["src/**/*.ts"]
+}

api-gateway/vite.config.ts

@@ -0,0 +1,6 @@
+// eslint-disable-next-line @nx/enforce-module-boundaries
+import { defineNodeConfig } from '../node-vite-config';
+
+export default defineNodeConfig({
+  root: __dirname,
+});

consumer-service/src/consumer.service.ts

@@ -21,7 +21,7 @@ export class ConsumerService implements ConsumerServiceHandlers {
 
   @restate.handler()
   async create(name: PersonName): Promise<UUID> {
-    const consumer = await this.consumer.create({ name }) as Consumer;
+    const consumer = (await this.consumer.create({ name })) as Consumer;
     await this.kafka.produce<KafkaConsumerTopic>([consumer]);
     return consumer.id;
   }

consumer-service/src/main.ts

@@ -4,13 +4,9 @@ import { RestateKafkaProducerModule } from 'deepkit-restate/kafka';
 import { RestateModule } from 'deepkit-restate';
 
 import { provideDatabase } from '@ftgo/common';
-import {
-  Account,
-  provideAccountingServiceApi,
-} from '@ftgo/accounting-service-api';
+import { Consumer } from '@ftgo/consumer-service-api';
 
 import { ConsumerServiceConfig } from './config.js';
-import { ConsumerController } from './consumer.controller.js';
 import { ConsumerService } from './consumer.service.js';
 import { ConsumerRepository } from './consumer.repository.js';
 
@@ -25,12 +21,8 @@ void new App({
       brokers: [''],
     }),
   ],
-  controllers: [ConsumerController, ConsumerService],
-  providers: [
-    provideDatabase([Account]),
-    provideAccountingServiceApi(),
-    ConsumerRepository,
-  ],
+  controllers: [ConsumerService],
+  providers: [provideDatabase([Consumer]), ConsumerRepository],
 })
   .setup((module, config: ConsumerServiceConfig) => {
     module