update to the new moleculer-db

Author: icebob

blog/package.json

@@ -13,16 +13,16 @@
   "dependencies": {
     "bluebird": "3.5.0",
     "chalk": "2.0.1",
-    "eslint": "4.1.1",
+    "eslint": "4.3.0",
     "express": "4.15.3",
     "fakerator": "0.3.0",
     "hashids": "1.1.1",
     "ioredis": "3.1.1",
     "lodash": "4.17.4",
     "moleculer": "0.8.2",
-    "moleculer-db": "0.3.3",
-    "moleculer-db-adapter-mongoose": "0.2.0",
-    "moleculer-fake": "1.0.3",
+    "moleculer-db": "0.4.1",
+    "moleculer-db-adapter-mongoose": "0.3.1",
+    "moleculer-fake": "1.0.4",
     "moleculer-repl": "0.1.3",
     "moleculer-web": "0.4.0",
     "moment": "2.18.1",
@@ -33,6 +33,6 @@
   },
   "devDependencies": {
     "nodemon": "1.11.0",
-    "npm-check": "5.4.4"
+    "npm-check": "5.4.5"
   }
 }

blog/services/posts.service.js

@@ -14,12 +14,12 @@ module.exports = {
 	model: Post,
 
 	settings: {
-		fields: "_id title content author likes category coverPhoto createdAt",
+		fields: ["_id", "title", "content", "author", "likes", "category", "coverPhoto", "createdAt"],
 		populates: {
 			"author": {
-				action: "users.model",
+				action: "users.get",
 				params: {
-					fields: "_id username fullName email avatar"
+					fields: ["_id", "username", "fullName", "avatar"]
 				}
 			}
 		},

blog/services/users.service.js

@@ -34,6 +34,10 @@ module.exports = {
 	adapter: new MongooseAdapter(process.env.MONGO_URI || "mongodb://localhost/moleculer-blog"),
 	model: User,
 
+	settings: {
+		fields: ["_id", "username", "fullName", "email", "avatar", "author"]
+	},
+
 	actions: {
 		authors: {
 			cache: true,

blog/services/www.service.js

@@ -41,7 +41,7 @@ module.exports = {
 
 			return Promise.resolve({ page })
 				.then(data => {
-					return this.broker.call("posts.list", { page, pageSize }).then(res => {
+					return this.broker.call("posts.list", { page, pageSize, populate: ["author"] }).then(res => {
 						data.posts = res.rows;
 						data.totalPages = res.totalPages;
 						return data;
@@ -60,7 +60,7 @@ module.exports = {
 
 			return Promise.resolve({ page })
 				.then(data => {
-					return this.broker.call("posts.list", { query: { category }, page, pageSize }).then(res => {
+					return this.broker.call("posts.list", { query: { category }, page, pageSize, populate: ["author"] }).then(res => {
 						data.posts = res.rows;
 						data.totalPages = res.totalPages;
 						return data;
@@ -81,7 +81,7 @@ module.exports = {
 
 			return Promise.resolve({ page })
 				.then(data => {
-					return this.broker.call("posts.list", { query: { author }, page, pageSize }).then(res => {
+					return this.broker.call("posts.list", { query: { author }, page, pageSize, populate: ["author"] }).then(res => {
 						data.posts = res.rows;
 						data.totalPages = res.totalPages;
 						return data;
@@ -102,7 +102,7 @@ module.exports = {
 
 			return Promise.resolve({ page })
 				.then(data => {
-					return this.broker.call("posts.list", { search, page, pageSize }).then(res => {
+					return this.broker.call("posts.list", { search, page, pageSize, populate: ["author"] }).then(res => {
 						data.query = search;
 						data.posts = res.rows;
 						data.totalPages = res.totalPages;
@@ -121,7 +121,7 @@ module.exports = {
 				return this.handleErr(res)(this.Promise.reject(new MoleculerError("Invalid POST ID", 404, "INVALID_POST_ID", { id: req.params.id })));
 
 			return Promise.resolve({ })
-				.then(data => this.broker.call("posts.get", { id }).then(post => {
+				.then(data => this.broker.call("posts.get", { id, populate: ["author"] }).then(post => {
 					if (!post)
 						return this.Promise.reject(new MoleculerError("Post not found", 404, "NOT_FOUND_POST", { id: req.params.id }));
 
@@ -136,7 +136,7 @@ module.exports = {
 		},
 
 		appendAdditionalData(data) {
-			return this.broker.call("posts.find", { limit: 5, sort: "-likes", populate: false }).then(posts => {
+			return this.broker.call("posts.find", { limit: 5, sort: "-likes" }).then(posts => {
 				data.bestOfPosts = posts;
 				return data;
 			});