Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision

Target

Select target project
  • simcaq/simcaq-node
  • SMPPIR/SMPPIR-Node
2 results
Select Git revision
Show changes
Commits on Source (198)
Showing
with 1524 additions and 16 deletions
......@@ -7,26 +7,25 @@ services:
- mongo:latest
variables:
MONGO_URI: 'mongodb://mongo/app_name'
NODE_ENV: 'test'
regression_tests:
stage: test
only: [development]
before_script:
- node -v
- cp config.json.example config.json
- npm install --global gulp gulp-cli babel babel-cli babel-core babel-register mocha gulp-mocha gulp-eslint
- npm install
- gulp build && gulp &
- curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
- python get-pip.py
run_tests:
stage: test
- sleep 60
script:
- git clone https://gitlab.c3sl.ufpr.br/simcaq/lde-api-regression-test.git
- ping -W1 -c1 mongo
- sed -i -e 's/false/true/g' config.json
- gulp build
- gulp test
- cd lde-api-regression-test
- git clone https://gitlab.c3sl.ufpr.br/SMPPIR/smppir-api-regression-test.git
- cd smppir-api-regression-test
- git checkout development
- pip install -r requirements.txt
- python regression_test.py --compare
- python manage.py compare
tags:
- node
......@@ -59,6 +59,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- Fix integral time
- Fix match queries in school_infrastructure
## 2019-07-03
### Changed
- Remove mongoose dependency so it can be used in SMPPIR
## 1.11.4 - 2019-06-17
## Changed
- Changed enrollment variable
......
SELECT
aluno_ens_superior.ano_censo,
COUNT(*) AS total
FROM
aluno_ens_superior
WHERE
(reserva_vagas = 1) AND
(bolsa_extensao = 1) AND
(cod_categoria_administrativa IN (1)) AND
(cod_organizacao_academica IN (1, 4, 5))
GROUP BY
aluno_ens_superior.ano_censo
ORDER BY
aluno_ens_superior.ano_censo ASC
;
SELECT
aluno_ens_superior.ano_censo,
COUNT(*) AS total
FROM
aluno_ens_superior
WHERE
(reserva_vagas = 1) AND
(bolsa_extensao = 1) AND
(cod_categoria_administrativa IN (1)) AND
(cod_organizacao_academica IN (1, 4, 5))
GROUP BY
aluno_ens_superior.ano_censo
;
SELECT
aluno_ens_superior.ano_censo,
COUNT(cod_aluno) AS total
FROM
aluno_ens_superior
WHERE
(reserva_vagas = 1) AND
(bolsa_extensao = 1) AND
(cod_categoria_administrativa IN (1)) AND
(cod_organizacao_academica IN (1, 4, 5))
GROUP BY
aluno_ens_superior.ano_censo
;
SELECT
aluno_ens_superior.ano_censo,
COUNT(cod_aluno) AS total
FROM
aluno_ens_superior
WHERE
(reserva_vagas = 1) AND
(bolsa_extensao = 1) AND
(cod_categoria_administrativa IN (1)) AND
(cod_organizacao_academica IN (1, 4, 5))
GROUP BY
aluno_ens_superior.ano_censo
ORDER BY
aluno_ens_superior.ano_censo ASC
;
SELECT
aluno_ens_superior.ano_censo,
COUNT(*) AS total
FROM
aluno_ens_superior
INNER JOIN
ies_ens_superior
ON (aluno_ens_superior.cod_ies = ies_ens_superior.cod_ies)
WHERE
(aluno_ens_superior.cod_aluno_situacao IN (4,5,7)) AND
(aluno_ens_superior.reserva_vagas = 1) AND
(aluno_ens_superior.cod_categoria_administrativa IN (1)) AND
(aluno_ens_superior.cod_organizacao_academica IN (1, 4, 5)) AND
(aluno_ens_superior.ano_censo = ies_ens_superior.ano_censo)
GROUP BY
aluno_ens_superior.ano_censo
ORDER BY
aluno_ens_superior.ano_censo ASC
;
SELECT
aluno_ens_superior.ano_censo,
COUNT(*) AS total
FROM
aluno_ens_superior
INNER JOIN
ies_ens_superior
ON (aluno_ens_superior.cod_ies = ies_ens_superior.cod_ies)
WHERE
(aluno_ens_superior.cod_aluno_situacao IN (4,5,7)) AND
(aluno_ens_superior.reserva_vagas = 1) AND
(aluno_ens_superior.cod_categoria_administrativa IN (1)) AND
(aluno_ens_superior.cod_organizacao_academica IN (1, 4, 5)) AND
(aluno_ens_superior.ano_censo = ies_ens_superior.ano_censo)
GROUP BY
aluno_ens_superior.ano_censo
;
SELECT
aluno_ens_superior.ano_censo,
COUNT(cod_aluno) AS total
FROM
aluno_ens_superior
INNER JOIN
ies_ens_superior
ON (aluno_ens_superior.cod_ies = ies_ens_superior.cod_ies)
WHERE
(aluno_ens_superior.cod_aluno_situacao IN (4,5,7)) AND
(aluno_ens_superior.reserva_vagas = 1) AND
(aluno_ens_superior.cod_categoria_administrativa IN (1)) AND
(aluno_ens_superior.cod_organizacao_academica IN (1, 4, 5)) AND
(aluno_ens_superior.ano_censo = ies_ens_superior.ano_censo)
GROUP BY
aluno_ens_superior.ano_censo
;
SELECT
aluno_ens_superior.ano_censo,
COUNT(cod_aluno) AS total
FROM
aluno_ens_superior
INNER JOIN
ies_ens_superior
ON (aluno_ens_superior.cod_ies = ies_ens_superior.cod_ies)
WHERE
(aluno_ens_superior.cod_aluno_situacao IN (4,5,7)) AND
(aluno_ens_superior.reserva_vagas = 1) AND
(aluno_ens_superior.cod_categoria_administrativa IN (1)) AND
(aluno_ens_superior.cod_organizacao_academica IN (1, 4, 5)) AND
(aluno_ens_superior.ano_censo = ies_ens_superior.ano_censo)
GROUP BY
aluno_ens_superior.ano_censo
ORDER BY
aluno_ens_superior.ano_censo ASC
;
SELECT
ano_censo,
COUNT(*) AS total
FROM
fies
WHERE
(ano_censo > 2011)
GROUP BY
ano_censo
ORDER BY
ano_censo ASC
;
SELECT
ano_censo,
COUNT(*) AS total
FROM
fies
WHERE
(ano_censo > 2011)
GROUP BY
ano_censo
;
SELECT
ano_censo,
COUNT(sigla_uf) AS total
FROM
fies
WHERE
(ano_censo > 2011)
GROUP BY
ano_censo
;
SELECT
ano_censo,
COUNT(sigla_uf) AS total
FROM
fies
WHERE
(ano_censo > 2011)
GROUP BY
ano_censo
ORDER BY
ano_censo ASC;
;
FROM node:dubnium-stretch
RUN apt-get -y update && apt-get install -y apt-utils
RUN npm install --global gulp gulp-cli babel babel-cli babel-core babel-register mocha gulp-mocha gulp-eslint istanbul --force
RUN mkdir API
COPY . ./API
WORKDIR ./API
RUN npm install
RUN npm un -g gulp
RUN npm i -g gulp@3.9.0
RUN gulp build
EXPOSE 4000
CMD gulp
# sudo docker build --tag api-smppir .
# sudo docker run --rm -p 4000:4000 --net="host" --name api-smppir api-smppir
+-----------+----------+
| ano_censo | total |
+===========+==========+
| 2012 | 5700370 |
| 2013 | 10779401 |
| 2014 | 16114623 |
| 2015 | 14457435 |
| 2016 | 17050881 |
| 2017 | 13783936 |
+-----------+----------+
6 tuples
real 0m1,993s
user 0m0,004s
sys 0m0,007s
+-----------+----------+
| ano_censo | total |
+===========+==========+
| 2012 | 5700370 |
| 2013 | 10779401 |
| 2014 | 16114623 |
| 2015 | 14457435 |
| 2016 | 17050881 |
| 2017 | 13783936 |
+-----------+----------+
6 tuples
real 0m1,905s
user 0m0,004s
sys 0m0,008s
+-----------+----------+
| ano_censo | total |
+===========+==========+
| 2012 | 5700370 |
| 2013 | 10779401 |
| 2014 | 16114623 |
| 2015 | 14457435 |
| 2016 | 17050881 |
| 2017 | 13783936 |
+-----------+----------+
6 tuples
real 0m1,906s
user 0m0,012s
sys 0m0,000s
+-----------+----------+
| ano_censo | total |
+===========+==========+
| 2012 | 5700370 |
| 2013 | 10779401 |
| 2014 | 16114623 |
| 2015 | 14457435 |
| 2016 | 17050881 |
| 2017 | 13783936 |
+-----------+----------+
6 tuples
real 0m1,964s
user 0m0,004s
sys 0m0,008s
+-----------+----------+
| ano_censo | total |
+===========+==========+
| 2012 | 5700370 |
| 2013 | 10779401 |
| 2014 | 16114623 |
| 2015 | 14457435 |
| 2016 | 17050881 |
| 2017 | 13783936 |
+-----------+----------+
6 tuples
real 0m1,972s
user 0m0,006s
sys 0m0,006s
+-----------+----------+
| ano_censo | total |
+===========+==========+
| 2012 | 5700370 |
| 2013 | 10779401 |
| 2014 | 16114623 |
| 2015 | 14457435 |
| 2016 | 17050881 |
| 2017 | 13783936 |
+-----------+----------+
6 tuples
real 0m1,955s
user 0m0,007s
sys 0m0,012s
+-----------+----------+
| ano_censo | total |
+===========+==========+
| 2012 | 5700370 |
| 2013 | 10779401 |
| 2014 | 16114623 |
| 2015 | 14457435 |
| 2016 | 17050881 |
| 2017 | 13783936 |
+-----------+----------+
6 tuples
real 0m2,205s
user 0m0,005s
sys 0m0,006s
+-----------+----------+
| ano_censo | total |
+===========+==========+
| 2012 | 5700370 |
| 2013 | 10779401 |
| 2014 | 16114623 |
| 2015 | 14457435 |
| 2016 | 17050881 |
| 2017 | 13783936 |
+-----------+----------+
6 tuples
real 0m1,781s
user 0m0,003s
sys 0m0,008s
+-----------+----------+
| ano_censo | total |
+===========+==========+
| 2012 | 5700370 |
| 2013 | 10779401 |
| 2014 | 16114623 |
| 2015 | 14457435 |
| 2016 | 17050881 |
| 2017 | 13783936 |
+-----------+----------+
6 tuples
real 0m1,930s
user 0m0,012s
sys 0m0,000s
+-----------+----------+
| ano_censo | total |
+===========+==========+
| 2012 | 5700370 |
| 2013 | 10779401 |
| 2014 | 16114623 |
| 2015 | 14457435 |
| 2016 | 17050881 |
| 2017 | 13783936 |
+-----------+----------+
6 tuples
real 0m2,097s
user 0m0,003s
sys 0m0,009s
This diff is collapsed.
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,465s
user 0m0,021s
sys 0m0,000s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,406s
user 0m0,005s
sys 0m0,008s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,278s
user 0m0,008s
sys 0m0,006s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,425s
user 0m0,004s
sys 0m0,009s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,440s
user 0m0,013s
sys 0m0,000s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,359s
user 0m0,004s
sys 0m0,009s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,392s
user 0m0,001s
sys 0m0,012s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,100s
user 0m0,005s
sys 0m0,008s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,617s
user 0m0,005s
sys 0m0,009s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,350s
user 0m0,006s
sys 0m0,014s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,362s
user 0m0,013s
sys 0m0,000s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,217s
user 0m0,010s
sys 0m0,003s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,450s
user 0m0,013s
sys 0m0,000s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,425s
user 0m0,021s
sys 0m0,000s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,508s
user 0m0,002s
sys 0m0,010s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,400s
user 0m0,005s
sys 0m0,008s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,222s
user 0m0,008s
sys 0m0,000s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,278s
user 0m0,004s
sys 0m0,009s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,800s
user 0m0,010s
sys 0m0,010s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m4,483s
user 0m0,009s
sys 0m0,004s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m8,195s
user 0m0,006s
sys 0m0,006s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m8,116s
user 0m0,007s
sys 0m0,006s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m8,013s
user 0m0,009s
sys 0m0,003s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m8,128s
user 0m0,004s
sys 0m0,010s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m8,207s
user 0m0,013s
sys 0m0,000s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m8,314s
user 0m0,009s
sys 0m0,000s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m7,836s
user 0m0,007s
sys 0m0,006s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m8,048s
user 0m0,004s
sys 0m0,007s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m7,773s
user 0m0,020s
sys 0m0,000s
+-----------+-------+
| ano_censo | total |
+===========+=======+
| 2010 | 723 |
| 2011 | 1080 |
| 2012 | 1508 |
| 2013 | 1783 |
| 2014 | 3150 |
| 2015 | 4157 |
| 2016 | 6412 |
+-----------+-------+
7 tuples
real 0m8,208s
user 0m0,009s
sys 0m0,004s