EOD 19/10/2022

This commit is contained in:
Ciro-pro
2022-10-19 21:22:05 -03:00
parent a36704b80e
commit 8dc07e551f
14 changed files with 436 additions and 49 deletions

View File

@@ -5,7 +5,7 @@ const Op = db.Sequelize.Op;
// Create and Save a new Candado
exports.create = (req, res) => {
// Validate request
if (!req.body.codigo) {
if (!req.body.id) {
console.log("body: ", req.body);
res.status(400).send({
message: "Content can not be empty!",
@@ -14,6 +14,7 @@ exports.create = (req, res) => {
}
// Create a Candado
const candado = {
_id: req.body.id,
codigo: req.body.codigo,
rut: req.body.rut,
bloqueo_id: req.body.bloqueo_id,
@@ -34,10 +35,35 @@ exports.create = (req, res) => {
});
};
// Update a Candado by the id in the request
exports.update = (req, res) => {
CandadoActivo.update(req.body, {
where: {
[Op.and]: [{ _id: req.body.id }, { bloqueo_id: req.body.bloqueo_id }],
},
})
.then((num) => {
if (num == 1) {
res.send({
message: "CandadoActivo was updated successfully.",
});
} else {
res.send({
message: `Cannot update CandadoActivo with id=${req.body.id} and bloqueo_id=${req.body.bloqueo_id}. Maybe Candado was not found or req.body is empty!`,
});
}
})
.catch((err) => {
res.status(500).send({
message: `Error updating CandadoActivo with id=${req.body.id} and bloqueo_id=${req.body.bloqueo_id}.`,
});
});
};
// Retrieve all Candados from the database.
exports.findAll = (req, res) => {
const title = req.query.title;
var condition = title ? { title: { [Op.like]: `%${title}%` } } : null;
const bloqueo = req.query.bloqueo_id;
var condition = bloqueo ? { bloqueo_id: bloqueo } : null;
CandadoActivo.findAll({ where: condition })
.then((data) => {
res.send(data);
@@ -45,7 +71,8 @@ exports.findAll = (req, res) => {
.catch((err) => {
res.status(500).send({
message:
err.message || "Some error occurred while retrieving Candados.",
err.message ||
"Some error occurred while retrieving Candados Activos.",
});
});
};
@@ -70,30 +97,6 @@ exports.findOne = (req, res) => {
});
};
// Update a Candado by the id in the request
exports.update = (req, res) => {
const id = req.params.id;
CandadoActivo.update(req.body, {
where: { id: id },
})
.then((num) => {
if (num == 1) {
res.send({
message: "Candado was updated successfully.",
});
} else {
res.send({
message: `Cannot update Candado with id=${id}. Maybe Candado was not found or req.body is empty!`,
});
}
})
.catch((err) => {
res.status(500).send({
message: "Error updating Candado with id=" + id,
});
});
};
// Delete a Candado with the specified id in the request
exports.delete = (req, res) => {
const id = req.params.id;

View File

@@ -2,7 +2,7 @@ module.exports = (sequelize, Sequelize) => {
const CandadoActivo = sequelize.define(
"candadoActivo",
{
id: {
_id: {
type: Sequelize.INTEGER,
allowNull: false,
},
@@ -30,7 +30,7 @@ module.exports = (sequelize, Sequelize) => {
},
{
indexes: [
// Create a unique index on email
// Create a unique index on id+bloqueo_id
{
unique: true,
fields: ["id", "bloqueo_id"],

View File

@@ -20,4 +20,5 @@ db.trabajadores = require("./trabajador.model.js")(sequelize, Sequelize);
db.candados = require("./candado.model.js")(sequelize, Sequelize);
db.equipos = require("./equipo.model.js")(sequelize, Sequelize);
db.usuarios = require("./usuario.model.js")(sequelize, Sequelize);
db.candadoActivos = require("./candadoActivo.model.js")(sequelize, Sequelize);
module.exports = db;

View File

@@ -4,24 +4,28 @@ module.exports = (app) => {
const candadosActivos = require("../controllers/candadoActivo.controller.js");
var router = require("express").Router();
// Create a new bloqueo
router.post("/", proxy.authenticateUser, candados.create);
router.post("/", proxy.authenticateUser, candadosActivos.create);
// // Retrieve a single bloqueo with id
// router.get("/:id", proxy.authenticateUser, candadosActivos.findOne);
// Retrieve all bloqueos
router.get("/", proxy.authenticateUser, candados.findAll);
// Retrieve all published bloqueos
router.get(
"/byBloqueo/:bloqueo",
proxy.authenticateUser,
candados.findAllByBloqueo
);
// Retrieve all published bloqueos
router.get("/byRut/:rut", proxy.authenticateUser, candados.findAllByRut);
// Retrieve a single bloqueo with id
router.get("/:id", proxy.authenticateUser, candados.findOne);
router.get("/", proxy.authenticateUser, candadosActivos.findAll);
// // Retrieve all published bloqueos
// router.get(
// "/byBloqueo/:bloqueo",
// proxy.authenticateUser,
// candadosActivos.findAllByBloqueo
// );
// // Retrieve all published bloqueos
// router.get(
// "/byRut/:rut",
// proxy.authenticateUser,
// candadosActivos.findAllByRut
// );
// Update a bloqueo with id
router.put("/:id", proxy.authenticateUser, candados.update);
// Delete a bloqueo with id
router.delete("/:id", proxy.authenticateUser, candados.delete);
// Delete all bloqueos
router.delete("/", proxy.authenticateUser, candados.deleteAll);
router.put("/", proxy.authenticateUser, candadosActivos.update);
// // Delete a bloqueo with id
// router.delete("/:id", proxy.authenticateUser, candadosActivos.delete);
// // Delete all bloqueos
// router.delete("/", proxy.authenticateUser, candadosActivos.deleteAll);
app.use("/api/candadosActivos", router);
};

54
compose.yaml Normal file
View File

@@ -0,0 +1,54 @@
#Archivo a agregar a compose.yaml de server de destino
version: "2.0"
services:
lsapi-db:
image: mariadb
restart: unless-stopped
container_name: lsapi-db
environment:
MARIADB_ROOT_PASSWORD: mymariadbpassword
MARIADB_DATABASE: lockout
MARIADB_USER: lockoutuser
MARIADB_PASSWORD: lockoutpassword
networks:
- lsapi-network
lsapi-adminer:
image: adminer
restart: unless-stopped
container_name: lsapi-adminer
environment:
VIRTUAL_HOST: lsapidb.coretec.cl
LETSENCRYPT_HOST: lsapidb.coretec.cl
LETSENCRYPT_EMAIL: info@coretec.cl
ports:
- 8080:8080
networks:
- proxy-tier
- lsapi-network
lsapi-node:
image: node:12
restart: unless-stopped
container_name: "lsapi-node.coretec.cl"
working_dir: /home/node/app
environment:
NODE_ENV: production
VIRTUAL_HOST: lsapi.coretec.cl
LETSENCRYPT_HOST: lsapi.coretec.cl
LETSENCRYPT_EMAIL: info@coretec.cl
PORT: 8000
volumes:
- ./lsapi.coretec.cl:/home/node/app
expose:
- "8000"
command: "npm start"
networks:
- proxy-tier
- lsapi-network
networks:
nextcloud_network:
lsapi-network:

35
files/cert.pem Normal file
View File

@@ -0,0 +1,35 @@
-----BEGIN CERTIFICATE-----
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
-----END CERTIFICATE-----

61
files/chain.pem Normal file
View File

@@ -0,0 +1,61 @@
-----BEGIN CERTIFICATE-----
MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
nLRbwHOoq7hHwg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIFYDCCBEigAwIBAgIQQAF3ITfU6UK47naqPGQKtzANBgkqhkiG9w0BAQsFADA/
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
DkRTVCBSb290IENBIFgzMB4XDTIxMDEyMDE5MTQwM1oXDTI0MDkzMDE4MTQwM1ow
TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwggIiMA0GCSqGSIb3DQEB
AQUAA4ICDwAwggIKAoICAQCt6CRz9BQ385ueK1coHIe+3LffOJCMbjzmV6B493XC
ov71am72AE8o295ohmxEk7axY/0UEmu/H9LqMZshftEzPLpI9d1537O4/xLxIZpL
wYqGcWlKZmZsj348cL+tKSIG8+TA5oCu4kuPt5l+lAOf00eXfJlII1PoOK5PCm+D
LtFJV4yAdLbaL9A4jXsDcCEbdfIwPPqPrt3aY6vrFk/CjhFLfs8L6P+1dy70sntK
4EwSJQxwjQMpoOFTJOwT2e4ZvxCzSow/iaNhUd6shweU9GNx7C7ib1uYgeGJXDR5
bHbvO5BieebbpJovJsXQEOEO3tkQjhb7t/eo98flAgeYjzYIlefiN5YNNnWe+w5y
sR2bvAP5SQXYgd0FtCrWQemsAXaVCg/Y39W9Eh81LygXbNKYwagJZHduRze6zqxZ
Xmidf3LWicUGQSk+WT7dJvUkyRGnWqNMQB9GoZm1pzpRboY7nn1ypxIFeFntPlF4
FQsDj43QLwWyPntKHEtzBRL8xurgUBN8Q5N0s8p0544fAQjQMNRbcTa0B7rBMDBc
SLeCO5imfWCKoqMpgsy6vYMEG6KDA0Gh1gXxG8K28Kh8hjtGqEgqiNx2mna/H2ql
PRmP6zjzZN7IKw0KKP/32+IVQtQi0Cdd4Xn+GOdwiK1O5tmLOsbdJ1Fu/7xk9TND
TwIDAQABo4IBRjCCAUIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
SwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5pZGVudHJ1
c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTEp7Gkeyxx
+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEB
ATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQu
b3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0LmNvbS9E
U1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFHm0WeZ7tuXkAXOACIjIGlj26Ztu
MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC
5WxCu2+b9LRPwkSICHXM6webFGJueN7sJ7o5XPWioW5WlHAQU7G75K/QosMrAdSW
9MUgNTP52GE24HGNtLi1qoJFlcDyqSMo59ahy2cI2qBDLKobkx/J3vWraV0T9VuG
WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O
he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC
Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5
-----END CERTIFICATE-----

52
files/key.pem Normal file
View File

@@ -0,0 +1,52 @@
-----BEGIN PRIVATE KEY-----
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
FEmZpec6dtrnyBVVHKtXbdAfm62f/w==
-----END PRIVATE KEY-----

View File

@@ -4,7 +4,8 @@
"description": "Lockout Success API",
"main": "server.js",
"scripts": {
"dev": "nodemon server.js"
"dev": "nodemon server.js",
"start": "node server.js"
},
"keywords": [
"node",

133
request-cloud.rest Normal file
View File

@@ -0,0 +1,133 @@
GET https://lsapi.coretec.cl/api/usuarios
###
GET https://lsapi.coretec.cl/api/usuarios/1
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG5AdGVzdC5jb20iLCJpYXQiOjE2NjYyMDU2Mjd9.Hd5ccQIZTwtet5hhvnNccUpAaHrY1UzE8bblJ5A4_H8
###
POST https://lsapi.coretec.cl/api/usuarios
Content-Type: application/json
{
"email": "john@test.com",
"password": "mypass"
}
###
POST https://lsapi.coretec.cl/api/usuarios/login
Content-Type: application/json
{
"email": "john@test.com",
"password": "mypass"
}
## TRABAJADORES
###
GET https://lsapi.coretec.cl/api/trabajadores
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG5AdGVzdC5jb20iLCJpYXQiOjE2NjYyMDU2Mjd9.Hd5ccQIZTwtet5hhvnNccUpAaHrY1UzE8bblJ5A4_H8
###
DELETE https://lsapi.coretec.cl/api/trabajadores/5
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG5AdGVzdC5jb20iLCJpYXQiOjE2NjYyMDU2Mjd9.Hd5ccQIZTwtet5hhvnNccUpAaHrY1UzE8bblJ5A4_H8
###
PUT https://lsapi.coretec.cl/api/trabajadores/12
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG5AdGVzdC5jb20iLCJpYXQiOjE2NjYyMDU2Mjd9.Hd5ccQIZTwtet5hhvnNccUpAaHrY1UzE8bblJ5A4_H8
Content-Type: application/json
{
"id": 12,
"rut": "11432448-5",
"empresa": "Coretec SpA"
}
## EQUIPOS
###
GET https://lsapi.coretec.cl/api/equipos
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG5AdGVzdC5jb20iLCJpYXQiOjE2NjYyMDU2Mjd9.Hd5ccQIZTwtet5hhvnNccUpAaHrY1UzE8bblJ5A4_H8
###
DELETE https://lsapi.coretec.cl/api/equipos/5
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG5AdGVzdC5jb20iLCJpYXQiOjE2NjYyMDU2Mjd9.Hd5ccQIZTwtet5hhvnNccUpAaHrY1UzE8bblJ5A4_H8
###
DELETE https://lsapi.coretec.cl/api/equipos
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG5AdGVzdC5jb20iLCJpYXQiOjE2NjYyMDU2Mjd9.Hd5ccQIZTwtet5hhvnNccUpAaHrY1UzE8bblJ5A4_H8
###
PUT https://lsapi.coretec.cl/api/equipos/6
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG5AdGVzdC5jb20iLCJpYXQiOjE2NjYyMDU2Mjd9.Hd5ccQIZTwtet5hhvnNccUpAaHrY1UzE8bblJ5A4_H8
Content-Type: application/json
{
"id": 1,
"descripcion": "EQ-PE-002",
"ubicacion": "Planta pelo"
}
###
POST https://lsapi.coretec.cl/api/equipos
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG5AdGVzdC5jb20iLCJpYXQiOjE2NjYyMDU2Mjd9.Hd5ccQIZTwtet5hhvnNccUpAaHrY1UzE8bblJ5A4_H8
Content-Type: application/json
{
"tag": "EQ-PE-010",
"descripcion": "Equipo 010 Planta 01",
"ubicacion": "Planta 01",
"bloqueo_id": 0
}
## CANDADOS
###
GET https://lsapi.coretec.cl/api/candados
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG5AdGVzdC5jb20iLCJpYXQiOjE2NjYyMDU2Mjd9.Hd5ccQIZTwtet5hhvnNccUpAaHrY1UzE8bblJ5A4_H8
###
PUT https://lsapi.coretec.cl/api/candados/186
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG5AdGVzdC5jb20iLCJpYXQiOjE2NjYyMDU2Mjd9.Hd5ccQIZTwtet5hhvnNccUpAaHrY1UzE8bblJ5A4_H8
Content-Type: application/json
{
"codigo": "CDD-04",
"id": "186",
"rut": "11432448-5"
}
## CANDADOACTIVO
###
POST https://lsapi.coretec.cl/api/candadosActivos
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG5AdGVzdC5jb20iLCJpYXQiOjE2NjYyMDU2Mjd9.Hd5ccQIZTwtet5hhvnNccUpAaHrY1UzE8bblJ5A4_H8
Content-Type: application/json
{
"codigo": "CDD-03",
"id": "224",
"rut": "21921219-4",
"bloqueo_id": 5,
"fecha_inicio": "2022-09-02T19:21:01.000Z"
}
###
PUT https://lsapi.coretec.cl/api/candadosActivos
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG5AdGVzdC5jb20iLCJpYXQiOjE2NjYyMDU2Mjd9.Hd5ccQIZTwtet5hhvnNccUpAaHrY1UzE8bblJ5A4_H8
Content-Type: application/json
{
"codigo": "CDD-03",
"id": "224",
"rut": "21921219-4",
"bloqueo_id": 5,
"fecha_inicio": "2022-09-02T19:21:01.000Z",
"fecha_fin": "2022-09-02T21:21:01.000Z"
}
###
GET https://lsapi.coretec.cl/api/candadosActivos
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG5AdGVzdC5jb20iLCJpYXQiOjE2NjYyMDU2Mjd9.Hd5ccQIZTwtet5hhvnNccUpAaHrY1UzE8bblJ5A4_H8
###
GET https://lsapi.coretec.cl/api/candadosActivos?bloqueo_id=4
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6ImpvaG5AdGVzdC5jb20iLCJpYXQiOjE2NjYyMDU2Mjd9.Hd5ccQIZTwtet5hhvnNccUpAaHrY1UzE8bblJ5A4_H8

View File

@@ -94,3 +94,36 @@ Content-Type: application/json
"id": "186",
"rut": "11432448-5"
}
## CANDADOACTIVO
###
POST http://localhost:8000/api/candadosActivos
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6Imp1YW5AdGVzdC5jb20iLCJpYXQiOjE2NjE4MTMyOTN9._xo3eCA6NDsKKjCJ1n6YBO6xM0RyHxXuLfP6HK604q4
Content-Type: application/json
{
"codigo": "CDD-03",
"id": "224",
"rut": "21921219-4",
"bloqueo_id": 5,
"fecha_inicio": "2022-09-02T19:21:01.000Z"
}
###
PUT http://localhost:8000/api/candadosActivos
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6Imp1YW5AdGVzdC5jb20iLCJpYXQiOjE2NjE4MTMyOTN9._xo3eCA6NDsKKjCJ1n6YBO6xM0RyHxXuLfP6HK604q4
Content-Type: application/json
{
"codigo": "CDD-03",
"id": "224",
"rut": "21921219-4",
"bloqueo_id": 5,
"fecha_inicio": "2022-09-02T19:21:01.000Z",
"fecha_fin": "2022-09-02T21:21:01.000Z"
}
###
GET http://localhost:8000/api/candadosActivos
Authorization: BEARER eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6Imp1YW5AdGVzdC5jb20iLCJpYXQiOjE2NjE4MTMyOTN9._xo3eCA6NDsKKjCJ1n6YBO6xM0RyHxXuLfP6HK604q4

View File

@@ -3,8 +3,12 @@ require("dotenv").config();
const express = require("express");
const cors = require("cors");
const app = express();
var corsOptions = {
origin: ["http://localhost:3000", "http://localhost:4000"],
// origin: ["http://localhost:3000", "http://localhost:4000"],
origin: "*",
credentials: true, //access-control-allow-credentials:true
optionSuccessStatus: 200,
};
app.use(cors(corsOptions));
// parse requests of content-type - application/json
@@ -23,6 +27,8 @@ require("./app/routes/trabajador.routes")(app);
require("./app/routes/candado.routes")(app);
require("./app/routes/equipo.routes")(app);
require("./app/routes/usuario.routes")(app);
require("./app/routes/candadoActivo.routes")(app);
const PORT = process.env.PORT || 8000;
app.listen(PORT, () => {
console.log(`Server is running on port ${PORT}.`);

4
sync2web.sh Executable file
View File

@@ -0,0 +1,4 @@
rsync -Pav -e "ssh -i $HOME/.ssh/id_rsa_bahamonde.org" package.json ciro@coretec01:/docker-services/lsapi.coretec.cl
rsync -Pav -e "ssh -i $HOME/.ssh/id_rsa_bahamonde.org" --exclude './app/config/db.config.js' app ciro@coretec01:/docker-services/lsapi.coretec.cl
rsync -Pav -e "ssh -i $HOME/.ssh/id_rsa_bahamonde.org" .env ciro@coretec01:/docker-services/lsapi.coretec.cl/
rsync -Pav -e "ssh -i $HOME/.ssh/id_rsa_bahamonde.org" server.js ciro@coretec01:/docker-services/lsapi.coretec.cl/