From 638890ad9f716987a36f0d2a5ea8e208df6d09c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE?= <matjaz@uplink.si>
Date: Mon, 7 Feb 2022 20:05:51 +0100
Subject: [PATCH] Razumem kako deluje sql in relacije med tabelami.

---
 app.js                                        |   1 +
 database/socialbot.db                         | Bin 24576 -> 32768 bytes
 ...-user.js => 20220207180916-create-user.js} |   0
 ...ge.js => 20220207180926-create-message.js} |   3 ---
 models/index.js                               |   4 ++--
 models/message.js                             |   2 --
 models/relations.js.old                       |   5 -----
 models/user.js                                |   9 +--------
 routes/message.js                             |   7 ++++++-
 9 files changed, 10 insertions(+), 21 deletions(-)
 rename migrations/{20220206215318-create-user.js => 20220207180916-create-user.js} (100%)
 rename migrations/{20220206215334-create-message.js => 20220207180926-create-message.js} (91%)
 delete mode 100644 models/relations.js.old

diff --git a/app.js b/app.js
index c1a245e..6ca51a1 100644
--- a/app.js
+++ b/app.js
@@ -11,6 +11,7 @@ var messagesRouter = require('./routes/message');
 var app = express();
 
 const db = require('./models');
+db.sequelize.sync({ force: true });
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
diff --git a/database/socialbot.db b/database/socialbot.db
index cd7fbfda50c2dce792bf624c9c9b79c1f263c6c6..c6d7517abc45f0289d2f1e05a206d9fffdc2bb44 100644
GIT binary patch
literal 32768
zcmeI4U2oG?9LA5GCTW^Drc6^bA;cN#Rx+sNmpCt#CXp4xqBWto30ubn3DiS|riCVD
zgNsRwPq2$g(>}p2_I3@LCha5aV&aY~geL8Vi%DGUV#jGy+by<?j6i6Ql~dQ}IsQNA
z{Cx6qe2%<)ZqXiE^s|l4es4%Ma)59gIY}uY<OxfYETviES(;~Qf~E1sjsFSRKOs_y
z3gT0e6beK<E&iH6l<y0L>`Znh<Sa-a00JNY0w4eaAOHd&@CpftPr2V;p*^f)6JS?R
zf36^3ajA6S@L}$5XV|;6W;LzBpm)U@jQ6Pp)2O!%+OB`FXwdFByGxIC?bR-AwA#iQ
z!=y`Qqggjs=tss1t#{gI8!dKT(`dC%(C(#;)mvS9zHTmjST~QUx?W_Nmp856&|0kz
zyYv)`-)=Mw+B(~&t<K^ileey~hRL0Qwb}64o5pFwG+GPBGVMCrV5fdXdbUMR8H)yM
z!LqR(-O1`KIi_@>zPwOBWfYetQibEkxs?%t!HqRGPP{m<ZfsfWm#saANgt0r;<5E!
z-#Wq0EZ#YvOcx3T?rwGzb5y6%p9$ajzRE^|={W3zdA&Cne7>>Cfb5}c^?UZ(zT6n>
zi(6c}FgwfLDURB;>_A$xZ?kSQ?D-COe>;7eb8+^!WB2mYPOEXQV|e>ivBswg%~_7v
z>#NomJJfqy!;R7LMPKxbitjMN-VM&!o(L@Q;(a1M6z_}Qi8q}*Y#;yvAOHd&00JNY
z0w4eaAOHd&00J+Fz>F%Z>?K!}ims`px$WBzbN%f*P14l?^Lg7-M%9&ZnJsoNhZQ)=
z^Ud7?Rk@~?#|7LVM>zhBw~Vq|W+%uLv*E>i&iMbH_^s%;VgmsX009sH0T2KI5C8!X
z009sH0T6g01m4*llLrj`opts{J%#p<{u48aCbwH6VEE6|#F>n@(7y4%kpGPwn0!RU
zZ^ZZVZQ(EBOW}>&_qq48e`K#r{X6yb)VrDcnWf1`tOzy`009sH0T2KI5O{qE*wbn9
zre16`jPr&%*yvkxo4xhbjsDztiKuncI;n15U$fV*Ndw#Y!89kcSA{CId0Cs+%2Gus
z)8n!{FS99|Fx5T~+e%j|Ay%$xi?OXVT@A5vRXZQsN~y{rR<3FbF|Bl|Rt;{ISG9Ao
zt*UaEm8;s>cvfmn(t~@TPqn9FTWMNg4`f!ZYG-0wDS9oaTQDnEwI^d*Rl~Z4>Q(J@
zY^zGO6xgb&<f?WmwpCftL#$lYPR6z>>A~HiD!HmX5!*_W!&>F4>^tb%OZpzN`IxP$
zNY#oKc&)su&Be4TOR5_9!K8ZC?e+hUiTIEBSp4%Pp@a<xfB*=900@8p2!H?xfB*=9
z00@A<^Aivsk?Fl>9r0!4_{3pu{FsV-hD#K<(SsMJo$-G@dqEI?5I+|A{Ezuh@(JN5
zVMUn8{ha$Wm(2c>z2J+40}ucK5C8!X009sH0T2LzXAv;-DKgh+kmfCV+TI)t>CW%(
zeG5oRB{nmt1kDWkRALIzgI46g=|&dRRf(C49@Jfb@~n2aDlxOsgKApfY$dCys}gf6
zdQe5LhA?$iVrHTS)udWEaJ@pws}gfEdeBNOaAKVWbyZ@fqX#W(VKsGCVy2=8EtP}2
zlqR_<F_Y1Qs+HgirAe+z%!%khm5|P_Nv=xFMAV?FR4oTCODK6&V)D_0mi55JA}pw@
z5|fJ>RF*1w;Ci)^SKayGa-QYyJP$C%lJ^<^J2G}400JNY0w4eaAOHd&00JNY0w4ea
zuQP$|_5Tlu__z4rb#4dh4gw$m0w4eaAOHd&00JNY0w4ea|3?A``6M~?7GX<{*01)i
RHG9LWz1s&lCokj6`wu55DAE7`

delta 244
zcmZo@U}`wPI6+!ant_3V4TxcYeWH%BxHN;F_XJ-49}KL#;SBt4{CoMN`Eq%~Hwy|p
z<l$^|WMdbXm1S(2tiT(|mtUTjT9lyR=@;Va?iw_?j5m0*6yGPt&4Lc=`Gu62n0$>4
zjDX0%%*fEx*w|$9S$SD@Fx${#@<(}Tpt^PZLMqI@jA-i4=*!7K)#)Y|r6!i7>XsI#
z7U^Xb^MafzuvszTKL5lC(vu2U*cb#D82G<JL<0B)xEVu%DvNm_3K<wS3nYBtpBTUa
E0IHWeFaQ7m

diff --git a/migrations/20220206215318-create-user.js b/migrations/20220207180916-create-user.js
similarity index 100%
rename from migrations/20220206215318-create-user.js
rename to migrations/20220207180916-create-user.js
diff --git a/migrations/20220206215334-create-message.js b/migrations/20220207180926-create-message.js
similarity index 91%
rename from migrations/20220206215334-create-message.js
rename to migrations/20220207180926-create-message.js
index b74e510..fe25652 100644
--- a/migrations/20220206215334-create-message.js
+++ b/migrations/20220207180926-create-message.js
@@ -8,9 +8,6 @@ module.exports = {
         primaryKey: true,
         type: Sequelize.INTEGER
       },
-      owner: {
-        type: Sequelize.INTEGER
-      },
       body: {
         type: Sequelize.STRING
       },
diff --git a/models/index.js b/models/index.js
index 8d1cf2f..42d548f 100644
--- a/models/index.js
+++ b/models/index.js
@@ -24,8 +24,8 @@ fs
     db[model.name] = model;
   });
 
-db.Message.belongsTo(db.User, {foreignKey: "id", as: "messages"});
-db.User.hasMany(db.Message, {oreignKey: "id", as: "owner"});
+  db.User.hasMany(db.Message, {foreignKey: 'UserId'});
+  db.Message.belongsTo(db.User);
 
 Object.keys(db).forEach(modelName => {
   if (db[modelName].associate) {
diff --git a/models/message.js b/models/message.js
index 0ca2721..3218cf1 100644
--- a/models/message.js
+++ b/models/message.js
@@ -1,5 +1,4 @@
 'use strict';
-const User = require('./user').User;
 const {
   Model
 } = require('sequelize');
@@ -15,7 +14,6 @@ module.exports = (sequelize, DataTypes) => {
     }
   }
   Message.init({
-    owner: DataTypes.INTEGER,
     body: DataTypes.STRING
   }, {
     sequelize,
diff --git a/models/relations.js.old b/models/relations.js.old
deleted file mode 100644
index 83b0288..0000000
--- a/models/relations.js.old
+++ /dev/null
@@ -1,5 +0,0 @@
-const Message = require('./message').Message;
-const User = require('./user').User;
-
-Message.belongsTo(User, {foreignKey: "id", as: "messages"});
-User.hasMany(Message, {oreignKey: "id", as: "owner"});
diff --git a/models/user.js b/models/user.js
index 39d32bd..402c6a1 100644
--- a/models/user.js
+++ b/models/user.js
@@ -1,5 +1,4 @@
 'use strict';
-const Message = require('./message');
 const {
   Model
 } = require('sequelize');
@@ -23,10 +22,4 @@ module.exports = (sequelize, DataTypes) => {
     modelName: 'User',
   });
   return User;
-};
-
-// const Message = require('./message').Message;
-
-// Message.belongsTo(User, {foreignKey: "id", as: "messages"});
-// User.hasMany(Message, {oreignKey: "id", as: "owner"});
-
+};
\ No newline at end of file
diff --git a/routes/message.js b/routes/message.js
index 81802a0..03b2b72 100644
--- a/routes/message.js
+++ b/routes/message.js
@@ -2,11 +2,16 @@ var express = require('express');
 const db = require('../models');
 var router = express.Router();
 var Message = db.Message;
-
+var User = db.User;
 /* GET users listing. */
 router.get('/', async function(req, res, next) {
   var messages = await Message.findAll();
   res.send(messages);
 });
 
+router.get('/new', async function(req, res, next) {
+  var message = await Message.create({'body':'My First Message', UserId:3});
+  res.send(message);
+});
+
 module.exports = router;