Merge branch 'postgres_migration' into 'development'

Postgres migration

See merge request !381

src/libs/routes_v1/activity.js

@@ -117,9 +117,9 @@ activityApp.get('/:id', (req, res, next) => {
       let actJSON = act.toJSON();
       //transform data yyyy-mm-dd to dd/mm/yyyy
       let date = actJSON.date.split('-');
-      let date_headline = actJSON.date_headline.split('-');
+      let date_start= actJSON.date_start.split('-');
       actJSON.date = date[2] + '/' + date[1] + '/' + date[0];
-      actJSON.date_headline = date_headline[2] + '/' + date_headline[1] + '/' + date_headline[0];
+      actJSON.date_start = date_start[2] + '/' + date_start[1] + '/' + date_start[0];
       req.result = actJSON;
       next();
     }
@@ -159,7 +159,8 @@ activityApp.post('/', passport.authenticate('bearer', { session: false }), autho
     text: req.body.texto,
     name_headline: req.body.nome,
     resume_headline: req.body.resumo,
-    date_headline: transformDateFormat(req.body.dataAtividade),
+    date_start: transformDateFormat(req.body.dataInicio),
+    date_end: transformDateFormat(req.body.dataEnd),
     local_headline: req.body.local,
     additional_headline: req.body.informacoes,
     is_draft: req.body.rascunho,
@@ -207,7 +208,8 @@ activityApp.put('/:id', passport.authenticate('bearer', { session: false }), aut
   act.text = req.body.texto || act.text;
   act.name_headline = req.body.nome || act.name_headline;
   act.resume_headline = req.body.resumo || act.resume_headline;
-  act.date_headline = req.body.dataAtividade || act.date_headline;
+  act.date_start = req.body.dataStart || act.date_start;
+  act.date_end = req.body.dataEnd || act.date_end;
   act.local_headline = req.body.local || act.local_headline;
   act.additional_headline = req.body.informacoes || act.additional_headline;
   act.is_draft = req.body.rascunho || act.is_draft;

src/libs/routes_v1/api.js

@@ -141,6 +141,8 @@ const publication = require(`${libs}/routes_v1/publication`);
 
 const activity = require(`${libs}/routes_v1/activity`);
 
+const email = require(`${libs}/routes_v1/email`);
+
 api.get('/', (req, res) => {
     res.json({ msg: 'SimCAQ API v1 is running' });
 });
@@ -207,4 +209,7 @@ api.use('/publication', publication);
 //Activity
 api.use('/activity', activity);
 
+//Email 
+api.use('/email', email);
+
 module.exports = api;

src/libs/routes_v1/email.js

+const express = require('express');
+
+const email = require(`../middlewares/email`);
+
+const log = require(`../log`)(module);
+
+const emailApp = express();
+
+const libs = `${process.cwd()}/libs`;
+
+const User = require(`${libs}/models/user`);
+
+const passport = require('passport');
+
+
+emailApp.get('/', async (req, res, next) => {
+    var emails = await User.findAll({attributes:['name','email']});
+    const emailsArray = emails.map(_email => _email.get());
+    res.json(emailsArray);
+   
+})
+
+
+module.exports = emailApp;

src/libs/routes_v1/publication.js

@@ -78,14 +78,13 @@ pubApp.get('/', async (req, res, next) => {
 });
 
 pubApp.get('/homepage', 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
   const totalCount = await Publication.count({ where: { is_headline: true } });
   const offset = (page - 1) * pageSize;
   const publis = await Publication.findAll({
     offset,
     limit: pageSize, 
-    order: [
-      ['created_at', ordenar],
-    ],
     where:{
       is_headline:true
     }
@@ -98,18 +97,18 @@ pubApp.get('/homepage', async (req, res, next)=> {
   });
 });
 
-pubApp.get('/type/:tp', async (req, res, next) => {
-  const tp = req.params.tp || 'all';
-  if(tp === 'all'){
+pubApp.get('/type', 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
+  const tipo = req.query.tipo || 'all';
+  console.log(tipo);
+  if(tipo === 'all'){
     const totalCount = await Publication.count();
     const offset = (page - 1) * pageSize;
 
     const publis = await Publication.findAll({
       offset,
       limit: pageSize,
-      order: [
-        ['created_at', ordenar],
-      ],
     });
 
     res.json({
@@ -120,16 +119,13 @@ pubApp.get('/type/:tp', async (req, res, next) => {
     });
   }
   else{
-    const totalCount = await Publication.count({ where: { filter: req.params.tp } });
+    const totalCount = await Publication.count({ where: { filter: tipo } });
     const offset = (page - 1) * pageSize;
     const publis = await Publication.findAll({
       offset,
       limit: pageSize,
-      order: [
-        ['created_at', ordenar],
-      ],
       where: {
-        filter: req.params.tp
+        filter: tipo
       }
     });
     res.json({
@@ -186,7 +182,7 @@ pubApp.post('/', passport.authenticate('bearer', { session: false }), authorized
     link: data.link,
     upload: _file_id,
     is_draft: data.rascunho,
-    is_homepage: data.homepage,
+    is_headline: data.homepage,
     volume: data.volume,
     pages: data.pagina
   }).catch(function (err) {
@@ -224,7 +220,7 @@ pubApp.post('/edit', passport.authenticate('bearer', { session: false }), author
   pb.year = data.ano || pb.year;
   pb.text = data.texto || pb.text;
   pb.link = data.link || pb.link;
-  pb.is_homepage = data.homepage || pb.is_homepage;
+  pb.is_headline = data.homepage || pb.is_headline;
   pb.is_draft = data.rascunho || pb.is_draft;
   pb.upload = _file_id || pb.upload;
   pb.volume = data.volume || pb.volume;