Fix DB mixin code

Author: icebob

template/mixins/db.mixin.ts

@@ -1,4 +1,4 @@
-import type { Context, ServiceSettingSchema, ServiceSchema } from "moleculer";
+import type { ServiceSettingSchema, ServiceSchema } from "moleculer";
 import { Service as DbService } from "@moleculer/database";
 import type { DatabaseMethods, DatabaseMixinOptions } from "@moleculer/database";
 import _ from "lodash";
@@ -8,7 +8,7 @@ export type DbServiceMethods = DatabaseMethods & {
 	seedDB?(): Promise<void>;
 };
 
-export interface DbMixinOpts extends DatabaseMixinOptions{
+export interface DbMixinOpts extends DatabaseMixinOptions {
 	collection: string;
 }
 
@@ -89,4 +89,4 @@ export default function (opts: DbMixinOpts): DbServiceSchema {
 	};
 
 	return schema;
-};
+}

template/services/api.service.ts

@@ -1,13 +1,17 @@
 import type { Context, ServiceSchema } from "moleculer";
-import type { Server as HttpServer } from 'http';
+import type { Server as HttpServer } from "http";
 import ApiGateway from "moleculer-web";
 import type { ApiSettingsSchema, Route, IncomingRequest, GatewayResponse } from "moleculer-web";
 {{#apiIO}}
 import SocketIOService from "moleculer-io";
 {{/apiIO}}
 {{#apiGQL}}
 import { ApolloService } from "moleculer-apollo-server";
-import type { ApolloServiceMethods, ApolloServiceLocalVars, ApolloServiceSettings } from "moleculer-apollo-server";
+import type {
+	ApolloServiceMethods,
+	ApolloServiceLocalVars,
+	ApolloServiceSettings
+} from "moleculer-apollo-server";
 import { GraphQLJSONObject } from "graphql-type-json";
 {{/apiGQL}}
 
@@ -26,6 +30,10 @@ interface LocalVars {
 	io: any;
 }
 
+if (process.env.TEST === "true") {
+	process.env.PORT = "0"; // Use random ports during tests
+}
+
 const ApiService: ServiceSchema<ApiSettingsSchema {{#apiGQL}}& ApolloServiceSettings, ApolloServiceMethods, LocalVars & ApolloServiceLocalVars{{/apiGQL}}> = {
 	name: "api",
 
@@ -60,7 +68,7 @@ const ApiService: ServiceSchema<ApiSettingsSchema {{#apiGQL}}& ApolloServiceSett
 	/** More info: https://moleculer.services/docs/0.15/moleculer-web.html */
 	settings: {
 		// Exposed port
-		port: process.env.PORT ? parseInt(process.env.PORT) : 3000,
+		port: process.env.PORT != null ? parseInt(process.env.PORT) : 3000,
 
 		// Exposed IP
 		ip: "0.0.0.0",

template/services/orders.service.ts

@@ -1,4 +1,4 @@
-import type { Context, Service, ServiceSchema, ServiceSettingSchema } from "moleculer";
+import type { Context, Service, ServiceSchema } from "moleculer";
 
 interface WorkflowPayload {
 	card?: string;

template/test/unit/mixins/db.mixin.spec.ts

@@ -15,7 +15,6 @@ describe("Test DB mixin", () => {
 
 			expect(schema.started).toBeDefined();
 			expect(schema.events["cache.clean.my-collection"]).toBeInstanceOf(Function);
-			expect(schema.methods.entityChanged).toBeInstanceOf(Function);
 		});
 
 		it("check cache event handler", async () => {
@@ -82,18 +81,5 @@ describe("Test DB mixin", () => {
 				expect(seedDBFn).toBeCalledWith();
 			});
 		});
-
-		it("should broadcast a cache clear event", async () => {
-			const schema = DbMixin({ collection: "my-collection" });
-
-			const ctx = {
-				broadcast: vi.fn()
-			};
-
-			await schema.methods!.entityChanged(null, null, null, ctx);
-
-			expect(ctx.broadcast).toBeCalledTimes(1);
-			expect(ctx.broadcast).toBeCalledWith("cache.clean.my-collection");
-		});
 	});
 });