[ADD] json field names

src/libs/models/user.js

@@ -26,9 +26,6 @@ var User = db.define("User",{
     hashed_password:{
         type: Sequelize.STRING,
         allowNull: false,
-        validate: {
-            notNull: { msg: "O campo Senha é obrigatório." },
-        }
     },
     salt: {
         type: Sequelize.STRING,
@@ -72,19 +69,15 @@ var User = db.define("User",{
     },
     course:{
         type: Sequelize.STRING,
-        allowNull: false,
     },
     complement:{
-        type: Sequelize.STRING,
-        allowNull: false,
+        type: Sequelize.STRING
     },
     address:{
         type: Sequelize.STRING,
-        allowNull: false,
     },
     phone:{
         type: Sequelize.STRING,
-        allowNull: false,
     },
     segment:{
         type: Sequelize.STRING,

src/libs/routes_v1/activity.js

@@ -20,6 +20,8 @@ const fileWorker = require('./file.controller.js');
 
 let upload = require('../middlewares/multer.config.js');
 
+const authorized = require(`${libs}/middlewares/authorize.js`);
+
 function emailSyntax(email) {
   const regex = /^(([^<>()\[\]\.,;:\s@\"]+(\.[^<>()\[\]\.,;:\s@\"]+)*)|(\".+\"))@(([^<>()[\]\.,;:\s@\"]+\.)+[^<>()[\]\.,;:\s@\"]{2,})$/i;
   return regex.test(email);
@@ -29,7 +31,9 @@ activityApp.get('/', async (req, res, next) => {
   const page = parseInt(req.query.page) || 1; 
   const pageSize = parseInt(req.query.pageSize) || 5; 
   try {
-    const totalCount = await Activity.count();
+    const totalCount = await Activity.count({where: {
+      is_draft: false
+    }});
     const offset = (page - 1) * pageSize;
 
     const acts = await Activity.findAll({
@@ -54,18 +58,20 @@ activityApp.get('/', async (req, res, next) => {
   }
 });
 
-activityApp.get('/', async (req, res, next) => {
+activityApp.get('/drafts', async (req, res, next) => {
     const page = parseInt(req.query.page) || 1; 
     const pageSize = parseInt(req.query.pageSize) || 5; 
     try {
-      const totalCount = await Activity.count();
+      const totalCount = await Activity.count({where: {
+        is_draft: true
+      }});
       const offset = (page - 1) * pageSize;
   
       const acts = await Activity.findAll({
         offset,
         limit: pageSize,
         where: {
-          is_draft: acts
+          is_draft: true
         },
         order:[
             ['date', 'DESC']]

src/libs/routes_v1/publication.js

@@ -33,7 +33,9 @@ pubApp.get('/', async (req, res, next) => {
   const page = parseInt(req.query.page) || 1; // Current page number
   const pageSize = parseInt(req.query.pageSize) || 5; // Number of items per page
   try {
-    const totalCount = await Publication.count();
+    const totalCount = await Publication.count({ where: {
+      is_draft: false
+    }});
     const offset = (page - 1) * pageSize;
 
     const publis = await Publication.findAll({
@@ -62,7 +64,9 @@ pubApp.get('/drafts', async (req, res, next) => {
 
   try {
     // Count total number of items
-    const totalCount = await Publication.count();
+    const totalCount = await Publication.count({ where: {
+      is_draft: true
+    }});
 
     // Calculate offset based on page and pageSize
     const offset = (page - 1) * pageSize;

src/libs/routes_v1/user.js

@@ -95,8 +95,15 @@ userApp.get('/', passport.authenticate('bearer', {session: false}), (req, res, n
 
 userApp.get('/me', passport.authenticate('bearer', { session: false }), (req, res, next) => {
   let u = req.user.toJSON();
+  u._id = u.id;
+  u.institutionName = u.institution_name;
+  u.receiveEmails = u.receive_email;
+  delete u.id;
+  delete u.institution_name;
+  delete u.receive_email;
   delete u.hashed_password;
   delete u.salt;
+
   req.result = u;
   next();
 }, response('user'));
@@ -108,6 +115,12 @@ userApp.get('/:id', (req, res, next) => {
       res.json({ msg: "O usuário não está cadastrado" });
     } else {
       let u = user.toJSON();
+      u._id = u.id;
+      u.institutionName = u.institution_name;
+      u.receiveEmails = u.receive_email;
+      delete u.id;
+      delete u.institution_name;
+      delete u.receive_email;
       delete u.hashed_password;
       delete u.salt;
       req.result = u;