temp

@@ -20,6 +20,7 @@ title TEXT NOT NULL,
 post TEXT NOT NULL,
 post TEXT NOT NULL,
 created_at DATETIME NOT NULL DEFAULT now(),
 created_at DATETIME NOT NULL DEFAULT now(),
 status TINYINT NOT NULL,
 status TINYINT NOT NULL,
+mbti CHAR(4) NOT NULL,
 PRIMARY KEY(id),
 PRIMARY KEY(id),
 INDEX userid_idx (userid ASC),
 INDEX userid_idx (userid ASC),
 CONSTRAINT commenter FOREIGN KEY (userid) REFERENCES tunnel.users (name)
 CONSTRAINT commenter FOREIGN KEY (userid) REFERENCES tunnel.users (name)

@@ -10,7 +10,6 @@ module.exports = class Comment extends Sequelize.Model {
             userid:{
             userid:{
                 type: Sequelize.STRING(30),
                 type: Sequelize.STRING(30),
                 allowNull: false,
                 allowNull: false,
-                unique:true,
             },
             },
             comment:{
             comment:{
                 type: Sequelize.TEXT,
                 type: Sequelize.TEXT,

@@ -20,6 +20,10 @@ module.exports = class Post extends Sequelize.Model {
                 allowNull: false,
                 allowNull: false,
                 defaultValue: Sequelize.NOW,
                 defaultValue: Sequelize.NOW,
             },
             },
+            mbti:{
+                type: Sequelize.CHAR(4),
+                allowNull: false,
+            }
         },{
         },{
             sequelize,
             sequelize,
             timestamps:false,
             timestamps:false,
@@ -35,9 +39,5 @@ module.exports = class Post extends Sequelize.Model {
 
 
     static associate(db) {
     static associate(db) {
         db.Post.belongsTo(db.User,{foreignKey: 'userid', targetKey:'name' });
         db.Post.belongsTo(db.User,{foreignKey: 'userid', targetKey:'name' });
-<<<<<<< HEAD
-        //db.Post.hasMany(db.Post,{foreignKey: 'postid', sourceKey:'id' });
-=======
->>>>>>> a7a00ce3dcec95df5fd17594f215fe752568dfa5
     }
     }
 };
 };
\ No newline at end of file

@@ -12,11 +12,9 @@ const {Comment}=require('../models');
 router.post('/reply',auth,(req,res)=>{
 router.post('/reply',auth,(req,res)=>{
 
 
     Comment.findAll({
     Comment.findAll({
-<<<<<<< HEAD
-        where:{postid: req.params.id},
-=======
+
         where:{postid: req.body.id},
         where:{postid: req.body.id},
->>>>>>> a7a00ce3dcec95df5fd17594f215fe752568dfa5
+
         order: [['created_at', 'ASC']],
         order: [['created_at', 'ASC']],
      })
      })
      .then((result)=>{
      .then((result)=>{
@@ -40,11 +38,8 @@ router.post('/write',auth,(req,res)=>{
     try{
     try{
     Comment.create({
     Comment.create({
         userid : req.session.name,
         userid : req.session.name,
-<<<<<<< HEAD
-        postid : req.body.id,
-=======
         postid : req.body.postid,
         postid : req.body.postid,
->>>>>>> a7a00ce3dcec95df5fd17594f215fe752568dfa5
+
         comment : req.body.comment,
         comment : req.body.comment,
     })
     })
     console.log("게시");
     console.log("게시");

@@ -9,12 +9,8 @@ const {Post}=require('../models'); //게시물정보 db연결
 //현재 로그인된 사용자의 게시물 배열 응답
 //현재 로그인된 사용자의 게시물 배열 응답
 router.get('/',auth,(req,res)=>{
 router.get('/',auth,(req,res)=>{
     Post.findAll({
     Post.findAll({
-        // where:{userid: req.session.name},
-<<<<<<< HEAD
-        // order: [['created_at', 'DESC']],
-=======
-        order: [['created_at', 'DESC']],
->>>>>>> a7a00ce3dcec95df5fd17594f215fe752568dfa5
+         where:{mbti: req.session.personality},
+         order: [['created_at', 'DESC']],
      })
      })
      .then((result)=>{
      .then((result)=>{
         //console.log(result);
         //console.log(result);
@@ -40,7 +36,8 @@ router.post('/',auth,(req,res)=>{
         userid : req.session.name,
         userid : req.session.name,
         title : req.body.title,
         title : req.body.title,
         post: req.body.content,
         post: req.body.content,
-        status: false
+        status: false,
+        mbti : req.session.personality
     })
     })
     console.log("게시");
     console.log("게시");
     res.sendStatus(200);
     res.sendStatus(200);