Merge branch 'master' into airbnb-prettier-eslint

wirmar · Oct 31, 2019 · b5c4393 · b5c4393
2 parents e541ab4 + 7526f36
commit b5c4393
Show file tree

Hide file tree

Showing 27 changed files with 1,176 additions and 503 deletions.
diff --git a/__tests__/serverjs/updatecards.test.js b/__tests__/serverjs/updatecards.test.js
@@ -31,7 +31,8 @@ const convertedExampleCard = {
   colors: ['R'],
   type: 'Creature — Devil',
   tcgplayer_id: 180776,
-  power: '3',
+  power: '4',
+  toughness: '3',
   image_small: 'https://img.scryfall.com/cards/small/front/a/5/a5ebb551-6b0d-45fa-88c8-3746214094f6.jpg?1547517462',
   image_normal: 'https://img.scryfall.com/cards/normal/front/a/5/a5ebb551-6b0d-45fa-88c8-3746214094f6.jpg?1547517462',
   art_crop: 'https://img.scryfall.com/cards/art_crop/front/a/5/a5ebb551-6b0d-45fa-88c8-3746214094f6.jpg?1547517462',
@@ -65,6 +66,7 @@ const convertedExampleDoubleFacedCardFlipFace = {
   type: 'Creature — Werewolf',
   tcgplayer_id: 57617,
   power: '2',
+  toughness: '2',
   image_small: undefined,
   image_normal: undefined,
   art_crop: undefined,

diff --git a/models/blog.js b/models/blog.js
@@ -1,6 +1,18 @@
 let mongoose = require('mongoose');
 
-// Cube schema
+//this pattern lets us define comment recursively
+var Comment = new mongoose.Schema();
+Comment.add({
+  owner: String,
+  ownerName: String,
+  content: String,
+  index: Number,
+  timePosted: Date,
+  comments: [Comment],
+  updated: Boolean
+});
+
+// Blog schema
 let blogSchema = mongoose.Schema({
   title: String,
   body: String,
@@ -10,7 +22,9 @@ let blogSchema = mongoose.Schema({
   html: String,
   dev: String,
   date_formatted: String,
-  changelist: String
+  changelist: String,
+  comments: [Comment]
 });
 
+
 let Blog = module.exports = mongoose.model('Blog', blogSchema)