From 37e7d757c3bd00a3fdc1a73b91f80826617eb246 Mon Sep 17 00:00:00 2001
From: Erik Roemmelt <roemmelter63329@th-nuernberg.de>
Date: Tue, 18 Jun 2019 15:47:42 +0200
Subject: [PATCH] moved db-model-schemata, adjust user-model

---
 message.model.js => database/message.model.js |  0
 tag.model.js => database/tag.model.js         |  0
 database/user.model.js                        | 21 +++++++++++++++++++
 user.model.js                                 | 14 -------------
 4 files changed, 21 insertions(+), 14 deletions(-)
 rename message.model.js => database/message.model.js (100%)
 rename tag.model.js => database/tag.model.js (100%)
 create mode 100644 database/user.model.js
 delete mode 100644 user.model.js

diff --git a/message.model.js b/database/message.model.js
similarity index 100%
rename from message.model.js
rename to database/message.model.js
diff --git a/tag.model.js b/database/tag.model.js
similarity index 100%
rename from tag.model.js
rename to database/tag.model.js
diff --git a/database/user.model.js b/database/user.model.js
new file mode 100644
index 0000000..632ccf0
--- /dev/null
+++ b/database/user.model.js
@@ -0,0 +1,21 @@
+const mongoose = require('mongoose');
+
+
+const UserSchema = mongoose.Schema({
+//    _id: { type: String },
+    name: { type: String, required: true },
+    pwd: { type: String },
+//    hash: { type: String },
+//    salt: { type: String },
+//    type: { type: String },
+    roles: { type: [String], required: true },
+    tags: { type: [String] },
+//    deactivated: { type: Boolean },
+//    participating: { type: [String] },
+//    host: { type: Boolean },
+    bookmarks: { type: [String] },
+});
+//tags as index:
+//UserSchema.index({tags:'text'});
+
+module.exports = mongoose.model('User', UserSchema);
diff --git a/user.model.js b/user.model.js
deleted file mode 100644
index c5115e7..0000000
--- a/user.model.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const mongoose = require('mongoose');
-
-
-const UserSchema = mongoose.Schema({
-    name: { type: String, required: true },
-    password: {type: String},    password: {type: String},
-
-    role: {type: String, required: true},
-    tags: [{type: String }],
-});
-//tags as index:
-//UserSchema.index({tags:'text'});
-
-module.exports = mongoose.model('User', UserSchema);