🔼 Bumped moleculer to 0.14.23

2022-08-18 00:29:25 -07:00
parent b0a7e42461
commit d2c171ab5e
8 changed files with 550 additions and 608 deletions
--- a/services/settings.service.ts
+++ b/services/settings.service.ts
@@ -18,91 +18,79 @@ export default class SettingsService extends Service {
 		schema: ServiceSchema<{}> = { name: "settings" }
 	) {
 		super(broker);
-		this.parseServiceSchema(
-			Service.mergeSchemas(
-				{
-					name: "settings",
-					mixins: [DbMixin("settings", Settings)],
-					settings: {},
-					hooks: {},
-					actions: {
-						getSettings: {
-							rest: "GET /getAllSettings",
-							params: {},
-							async handler(
-								ctx: Context<{ settingsKey: string }>
-							) {
-								const settings = await Settings.find({});
-								if (isEmpty(settings)) {
-									return {};
-								}
-								console.log(settings[0]);
-								return settings[0];
-							},
-						},
-
-						saveSettings: {
-							rest: "POST /saveSettings",
-							params: {},
-							async handler(
-								ctx: Context<{
-									settingsPayload: {
-										host: object;
-										airDCPPUserSettings: object;
-										hubs: [];
-									};
-									settingsObjectId: string;
-								}>
-							) {
-								console.log("varan bhat", ctx.params);
-								const { host, airDCPPUserSettings, hubs } =
-									ctx.params.settingsPayload;
-								let query = {
-									host,
-									airDCPPUserSettings,
-									hubs,
-								};
-								const keysToUpdate = pickBy(query, identity);
-								let updateQuery = {};
-
-								map(Object.keys(keysToUpdate), (key) => {
-									updateQuery[`directConnect.client.${key}`] =
-										query[key];
-								});
-								const options = {
-									upsert: true,
-									new: true,
-									setDefaultsOnInsert: true,
-								};
-								const filter = {
-									_id: new ObjectId(
-										ctx.params.settingsObjectId
-									),
-								};
-								const result = Settings.findOneAndUpdate(
-									filter,
-									{ $set: updateQuery },
-									options
-								);
-
-								return result;
-							},
-						},
-						deleteSettings: {
-							rest: "POST /deleteSettings",
-							params: {},
-							async handler(ctx: Context<{}>) {
-								return await Settings.remove(
-									{},
-									(result) => result
-								);
-							},
-						},
+		this.parseServiceSchema({
+			name: "settings",
+			mixins: [DbMixin("settings", Settings)],
+			settings: {},
+			hooks: {},
+			actions: {
+				getSettings: {
+					rest: "GET /getAllSettings",
+					params: {},
+					async handler(ctx: Context<{ settingsKey: string }>) {
+						const settings = await Settings.find({});
+						if (isEmpty(settings)) {
+							return {};
+						}
+						console.log(settings[0]);
+						return settings[0];
 					},
-					methods: {},
 				},
-				schema
-			)
-		);
+
+				saveSettings: {
+					rest: "POST /saveSettings",
+					params: {},
+					async handler(
+						ctx: Context<{
+							settingsPayload: {
+								host: object;
+								airDCPPUserSettings: object;
+								hubs: [];
+							};
+							settingsObjectId: string;
+						}>
+					) {
+						console.log("varan bhat", ctx.params);
+						const { host, airDCPPUserSettings, hubs } =
+							ctx.params.settingsPayload;
+						let query = {
+							host,
+							airDCPPUserSettings,
+							hubs,
+						};
+						const keysToUpdate = pickBy(query, identity);
+						let updateQuery = {};
+
+						map(Object.keys(keysToUpdate), (key) => {
+							updateQuery[`directConnect.client.${key}`] =
+								query[key];
+						});
+						const options = {
+							upsert: true,
+							new: true,
+							setDefaultsOnInsert: true,
+						};
+						const filter = {
+							_id: new ObjectId(ctx.params.settingsObjectId),
+						};
+						const result = Settings.findOneAndUpdate(
+							filter,
+							{ $set: updateQuery },
+							options
+						);
+
+						return result;
+					},
+				},
+				deleteSettings: {
+					rest: "POST /deleteSettings",
+					params: {},
+					async handler(ctx: Context<{}>) {
+						return await Settings.remove({}, (result) => result);
+					},
+				},
+			},
+			methods: {},
+		});
 	}
 }