finished guild api route rewrite

feinwarusoftware · Sep 4, 2018 · 4826139 · 4826139
1 parent e2a04c9
commit 4826139
Show file tree

Hide file tree

Showing 6 changed files with 449 additions and 83 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "jimp": "^0.2.28",
     "jsonwebtoken": "^8.3.0",
     "moment-timezone": "^0.5.21",
-    "mongoose": "^5.1.6",
+    "mongoose": "^5.2.13",
     "morgan": "^1.9.0",
     "showdown": "^1.8.6"
   }

diff --git a/src/db/index.js b/src/db/index.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const GuildSchema = require("./schemas/guild");
+const { GuildSchema, GuildScriptSchema } = require("./schemas/guild");
 const LogSchema = require("./schemas/log");
 const ScriptSchema = require("./schemas/script");
 const SessionSchema = require("./schemas/session");
@@ -9,6 +9,7 @@ const UserSchema = require("./schemas/user");
 module.exports = {
 
     GuildSchema,
+    GuildScriptSchema,
     LogSchema,
     ScriptSchema,
     SessionSchema,

diff --git a/src/db/schemas/guild.js b/src/db/schemas/guild.js
@@ -44,4 +44,5 @@ const GuildSchema = new Schema({
     scripts: [ guildScriptSchema ],
 });
 
-module.exports = mongoose.model("Guild", GuildSchema);
+module.exports.GuildSchema = mongoose.model("Guild", GuildSchema);
+module.exports.GuildScriptSchema = mongoose.model("GuildScript", guildScriptSchema);
diff --git a/src/db/schemas/script.js b/src/db/schemas/script.js
@@ -48,7 +48,7 @@ const ScriptSchema = new Schema({
     author_id: { type: Schema.Types.ObjectId, required: true },
 
     // User set parameters. Note that 'thumbnail' should be set to a url of an image.
-    name: { type: String, requried: true },
+    name: { type: String, required: true },
     description: { type: String, default: "" },
     thumbnail: { type: String, default: getRandomThumbnail },
     marketplace_enabled: { type: Boolean, default: false },