From 31f1add35d9f460a48c436f404babf73c26605fe Mon Sep 17 00:00:00 2001
From: senta_mandutz <mandutzse68104@th-nuernberg.de>
Date: Fri, 8 Feb 2019 13:40:21 +0100
Subject: [PATCH] everything i working

---
 message.model.js        | 10 ++++++++++
 public/createMessage.js | 14 +++++++-------
 public/home.js          |  1 +
 server.js               | 37 ++++++++++++++++++++++++++-----------
 4 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/message.model.js b/message.model.js
index e157b8c..773eb1d 100644
--- a/message.model.js
+++ b/message.model.js
@@ -1,6 +1,16 @@
 const mongoose = require('mongoose');
 
+//const Schema = mongoose.Schema,
+//ObjectId = Schema.ObjectId;
+
 const MessageSchema = mongoose.Schema({
+    //_id: ObjectId,
+    /*id: {
+        type: String,
+        getter: function(val) { return this._id.toString(); },
+        unique: true
+    },*/
+    //id: {type: String, required: true},
     subject: { type: String, required: true },
     message: { type: String, required: true },
     user: { type: String, required: true },
diff --git a/public/createMessage.js b/public/createMessage.js
index 2a4a8ab..b0cf800 100644
--- a/public/createMessage.js
+++ b/public/createMessage.js
@@ -5,19 +5,19 @@ const CreateMsgRouter = {
 	<form class="new-msg-form" @submit.prevent=createMsg>
 		<div class="form-group bmd-form-group">
 			<label class="bmd-label-floating">Betreff</label>
-			<input type="text" class="form-control" id="subject">
+			<input type="text" class="form-control" id="subject" value="WICHTIG!">
 		</div>
 		<div class="form-group bmd-form-group">
 			<label class="bmd-label-floating">Tags</label>
-			<input type="text" class="form-control" id="tag">
+			<input type="text" class="form-control" id="tag" value="#efi">
 		</div>
 		<div class="form-group">
 			<label class="bmd-label-floating">Nachricht</label>
-			<textarea class="form-control" id="message" rows="5"></textarea>
+			<textarea class="form-control" id="message" rows="5">Nachricht</textarea>
 		</div>
 		<div class="form-group">
 			<label class="bmd-label-floating">User</label>
-			<textarea class="form-control" id="user"></textarea>
+			<input type="text" class="form-control" id="user" value="Dito27">
 		</div>
 		<div class="form-group">
 			<div class="checkbox">
@@ -40,13 +40,13 @@ const CreateMsgRouter = {
 			var message=$("#message").val();
 			var tag=$("#tag").val();
 			var user=$("#user").val();
-			console.log ("Message Created: "+id+" "+tag+" "+message+" "+user);
-			$.ajax ({ url: "/api/createMsg", data: {subject: subject, tag: tag, message: message, user: user}, method: "POST" }) .done (have_result) .fail (have_error);
+			console.log ("Message Created: "+tag+" "+message+" "+user);
+			$.ajax ({ url: "/api/createMsg", data: {sub: subject,  mess: message, use: user, ta: tag}, method: "POST" }) .done (have_result) .fail (have_error);
 			function have_result (res) {
 				console.log (res);
 			}
 			function have_error (err) {
-				console.log ("error:" + err.responseText);
+				console.log ("error: " + err.responseText);
 				console.log (err);
 			}
 		},
diff --git a/public/home.js b/public/home.js
index f95329e..6d24109 100644
--- a/public/home.js
+++ b/public/home.js
@@ -29,6 +29,7 @@ const HomeRouter = {
                 // NICHT SO wg. Vue: _messagelist = jd;
                 _messagelist.splice(0, _messagelist.length);
                 _messagelist.push.apply(_messagelist, jd);
+                console.log("jd: "+jd);
                 for (var e in jd) {
                     if (!_messages[jd[e]]) {
                         get_insert_message(jd[e]);
diff --git a/server.js b/server.js
index caebecb..6d8078b 100644
--- a/server.js
+++ b/server.js
@@ -103,14 +103,14 @@ mongoose.connect(dbConfig.url)
 
 //require('./app/routes/message.route.js')(app);
 
-
 app.get ('/api/ids', function (req, res) {
-    Message.find({},{_id: true}) .exec () .then(results => {
-        /* selects id from message: var parsed = [];
+    Message.find({},{id: true}) .exec () .then(results => {
+        //selects id from message:
+        var parsed = [];
         for (var i in results) {
-            parsed.push (results[i]._id);
-        } */
-        var parsed = results.map (x => x._id);
+            parsed.push (results[i].id);
+        }
+        //var parsed = results.map (x => x._id);
         res.send(parsed);
     } )
     .catch(err => {
@@ -131,14 +131,29 @@ app.get ("/api/msg/:id", function (req, res) {
     });
 });
 
+function makeid() {
+  var text = "";
+  var possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+
+  for (var i = 0; i < 5; i++)
+    text += possible.charAt(Math.floor(Math.random() * possible.length));
+
+  return text;
+}
+
 app.post("/api/createMsg", function(req, res){
-	var message = new Message(req.body);
+    //x = mongoose.Types.ObjectId();
+    //y = x.toString();
+    //var z = makeid();
+    console.log("SUbject: "+JSON.stringify(req.body));
+	var message = new Message( {subject: req.body.sub, message: req.body.mess, user: req.body.use, tag: req.body.ta } );
 
 	message.save(function(err,result){
-		if(err)
-			return res .status(401) .send(err.message);
-
-		res.json({message: "Message created!!"});
+		if(err){
+            return res .status(401) .send(err.message);
+        }else{
+            res.json({message: "Message created!!"});
+        }
 	});
 });