🔧 Fixes to volumeGroup method, updated moleculer

This commit is contained in:
2022-01-27 20:28:18 -08:00
parent c3ef3055fd
commit 880a9ff12c
5 changed files with 42 additions and 29 deletions

View File

@@ -33,9 +33,9 @@ import {
*/ */
const brokerConfig: BrokerOptions = { const brokerConfig: BrokerOptions = {
// Namespace of nodes to segment your nodes on the same network. // Namespace of nodes to segment your nodes on the same network.
namespace: "threetwo-core-services", namespace: "",
// Unique node identifier. Must be unique in a namespace. // Unique node identifier. Must be unique in a namespace.
nodeID: null, nodeID: "threetwo-core-service",
// Custom metadata store. Store here what you want. Accessing: `this.broker.metadata` // Custom metadata store. Store here what you want. Accessing: `this.broker.metadata`
metadata: {}, metadata: {},
@@ -91,7 +91,7 @@ const brokerConfig: BrokerOptions = {
// More info: https://moleculer.services/docs/0.14/networking.html // More info: https://moleculer.services/docs/0.14/networking.html
// Note: During the development, you don't need to define it because all services will be loaded locally. // Note: During the development, you don't need to define it because all services will be loaded locally.
// In production you can set it via `TRANSPORTER=nats://localhost:4222` environment variable. // In production you can set it via `TRANSPORTER=nats://localhost:4222` environment variable.
transporter: "redis", // "NATS" transporter: "redis://localhost:6379",
// Define a cacher. // Define a cacher.
// More info: https://moleculer.services/docs/0.14/caching.html // More info: https://moleculer.services/docs/0.14/caching.html

52
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "threetwo-library-service", "name": "threetwo-core-service",
"version": "1.0.0", "version": "0.0.1",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "threetwo-library-service", "name": "threetwo-core-service",
"version": "1.0.0", "version": "0.0.1",
"dependencies": { "dependencies": {
"@elastic/elasticsearch": "^7.16.0", "@elastic/elasticsearch": "^7.16.0",
"@root/walk": "^1.1.0", "@root/walk": "^1.1.0",
@@ -16,7 +16,7 @@
"@types/string-similarity": "^4.0.0", "@types/string-similarity": "^4.0.0",
"7zip-bin": "^5.1.1", "7zip-bin": "^5.1.1",
"7zip-min": "^1.4.0", "7zip-min": "^1.4.0",
"chokidar": "^3.5.2", "chokidar": "^3.5.3",
"dotenv": "^10.0.0", "dotenv": "^10.0.0",
"fs-extra": "^10.0.0", "fs-extra": "^10.0.0",
"imghash": "^0.0.9", "imghash": "^0.0.9",
@@ -26,13 +26,13 @@
"leven": "^3.1.0", "leven": "^3.1.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"mkdirp": "^0.5.5", "mkdirp": "^0.5.5",
"moleculer": "^0.14.16", "moleculer": "^0.14.19",
"moleculer-addons": "github:rishighan/moleculer-addons#master", "moleculer-addons": "github:rishighan/moleculer-addons#master",
"moleculer-bull": "^0.2.8", "moleculer-bull": "^0.2.8",
"moleculer-db": "^0.8.13", "moleculer-db": "^0.8.13",
"moleculer-db-adapter-mongo": "^0.4.7", "moleculer-db-adapter-mongo": "^0.4.7",
"moleculer-db-adapter-mongoose": "^0.8.9", "moleculer-db-adapter-mongoose": "^0.8.9",
"moleculer-web": "^0.10.3", "moleculer-web": "^0.10.4",
"mongoose": "^5.12.7", "mongoose": "^5.12.7",
"mongoose-elasticsearch-xp": "^5.8.0", "mongoose-elasticsearch-xp": "^5.8.0",
"mongoose-paginate-v2": "^1.3.18", "mongoose-paginate-v2": "^1.3.18",
@@ -2960,9 +2960,15 @@
} }
}, },
"node_modules/chokidar": { "node_modules/chokidar": {
"version": "3.5.2", "version": "3.5.3",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
"integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
"funding": [
{
"type": "individual",
"url": "https://paulmillr.com/funding/"
}
],
"dependencies": { "dependencies": {
"anymatch": "~3.1.2", "anymatch": "~3.1.2",
"braces": "~3.0.2", "braces": "~3.0.2",
@@ -9022,14 +9028,22 @@
"integrity": "sha512-t68lVmU+VznsivQKM6Fr1HSRQ2+m54OouiDkeCzRUQJO3N4h9l60DlcHFu2HAn6Kw5nsZEbOtnkk5OBhhOErxA==" "integrity": "sha512-t68lVmU+VznsivQKM6Fr1HSRQ2+m54OouiDkeCzRUQJO3N4h9l60DlcHFu2HAn6Kw5nsZEbOtnkk5OBhhOErxA=="
}, },
"node_modules/node-fetch": { "node_modules/node-fetch": {
"version": "2.6.6", "version": "2.6.7",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
"integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==", "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
"dependencies": { "dependencies": {
"whatwg-url": "^5.0.0" "whatwg-url": "^5.0.0"
}, },
"engines": { "engines": {
"node": "4.x || >=6.0.0" "node": "4.x || >=6.0.0"
},
"peerDependencies": {
"encoding": "^0.1.0"
},
"peerDependenciesMeta": {
"encoding": {
"optional": true
}
} }
}, },
"node_modules/node-fetch/node_modules/tr46": { "node_modules/node-fetch/node_modules/tr46": {
@@ -14135,9 +14149,9 @@
"dev": true "dev": true
}, },
"chokidar": { "chokidar": {
"version": "3.5.2", "version": "3.5.3",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
"integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
"requires": { "requires": {
"anymatch": "~3.1.2", "anymatch": "~3.1.2",
"braces": "~3.0.2", "braces": "~3.0.2",
@@ -18662,9 +18676,9 @@
"integrity": "sha512-t68lVmU+VznsivQKM6Fr1HSRQ2+m54OouiDkeCzRUQJO3N4h9l60DlcHFu2HAn6Kw5nsZEbOtnkk5OBhhOErxA==" "integrity": "sha512-t68lVmU+VznsivQKM6Fr1HSRQ2+m54OouiDkeCzRUQJO3N4h9l60DlcHFu2HAn6Kw5nsZEbOtnkk5OBhhOErxA=="
}, },
"node-fetch": { "node-fetch": {
"version": "2.6.6", "version": "2.6.7",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
"integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==", "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
"requires": { "requires": {
"whatwg-url": "^5.0.0" "whatwg-url": "^5.0.0"
}, },

View File

@@ -1,7 +1,7 @@
{ {
"name": "threetwo-library-service", "name": "threetwo-core-service",
"version": "1.0.0", "version": "0.0.1",
"description": "My Moleculer-based microservices project", "description": "",
"scripts": { "scripts": {
"build": "tsc --build tsconfig.json", "build": "tsc --build tsconfig.json",
"dev": "ts-node ./node_modules/moleculer/bin/moleculer-runner.js --hot --repl --config moleculer.config.ts services/**/*.service.ts", "dev": "ts-node ./node_modules/moleculer/bin/moleculer-runner.js --hot --repl --config moleculer.config.ts services/**/*.service.ts",
@@ -53,13 +53,13 @@
"leven": "^3.1.0", "leven": "^3.1.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"mkdirp": "^0.5.5", "mkdirp": "^0.5.5",
"moleculer": "^0.14.16", "moleculer": "^0.14.19",
"moleculer-addons": "github:rishighan/moleculer-addons#master", "moleculer-addons": "github:rishighan/moleculer-addons#master",
"moleculer-bull": "^0.2.8", "moleculer-bull": "^0.2.8",
"moleculer-db": "^0.8.13", "moleculer-db": "^0.8.13",
"moleculer-db-adapter-mongo": "^0.4.7", "moleculer-db-adapter-mongo": "^0.4.7",
"moleculer-db-adapter-mongoose": "^0.8.9", "moleculer-db-adapter-mongoose": "^0.8.9",
"moleculer-web": "^0.10.3", "moleculer-web": "^0.10.4",
"mongoose": "^5.12.7", "mongoose": "^5.12.7",
"mongoose-elasticsearch-xp": "^5.8.0", "mongoose-elasticsearch-xp": "^5.8.0",
"mongoose-paginate-v2": "^1.3.18", "mongoose-paginate-v2": "^1.3.18",

View File

@@ -141,7 +141,6 @@ export default class ApiService extends Service {
console.log( console.log(
"File detected, starting import..." "File detected, starting import..."
); );
// this walking business needs to go, SACURATAYYY, SACURATAYYY!! This dude needs to go.
const walkedFolder: IFolderData = const walkedFolder: IFolderData =
await broker.call("import.walkFolders", { await broker.call("import.walkFolders", {
basePathToWalk: path, basePathToWalk: path,

View File

@@ -367,7 +367,7 @@ export default class ImportService extends Service {
}, },
{ {
$match: { $match: {
count: { $gte: 2 }, count: { $gte: 1 },
}, },
}, },
{ $sort: { updatedAt: -1 } }, { $sort: { updatedAt: -1 } },