From 29036d14a8a9a8d2b8820b2aff038a4943fa237a Mon Sep 17 00:00:00 2001 From: Pau Date: Sat, 12 Apr 2025 14:40:54 +0200 Subject: [PATCH] fixed imports and exports --- .../resource_types/coordinatesController.js | 10 +++++----- src/controllers/resource_types/placesController.js | 3 +-- .../resource_types/reportTypesController.js | 12 ++++++------ .../resource_types/usersHasPlacesController.js | 2 +- src/models/resource_types/coordinatesModel.js | 2 +- src/models/resource_types/placesModel.js | 3 +-- src/models/resource_types/reportTypesModel.js | 2 +- src/models/resource_types/usersHasPlacesModel.js | 2 +- .../resource_types/coordinatesRepository.js | 2 +- .../resource_types/reportTypesRepository.js | 2 +- .../resource_types/usersHasPlacesRepository.js | 2 +- 11 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/controllers/resource_types/coordinatesController.js b/src/controllers/resource_types/coordinatesController.js index 57d15da..682a0eb 100644 --- a/src/controllers/resource_types/coordinatesController.js +++ b/src/controllers/resource_types/coordinatesController.js @@ -4,12 +4,12 @@ import { insertCoordinatesModel, modifyCoordinatesModel, softDeleteCoordinatesModel -} from "../../models/resource_types/coordinatesModel"; -import { error404 } from "../../utils/errors"; -import { sendResponseNotFound } from "../../utils/responses"; -import { noResults } from "../../validators/result-validators"; +} from "../../models/resource_types/coordinatesModel.js"; +import { error404 } from "../../utils/errors.js" +import { sendResponseNotFound } from "../../utils/responses.js"; +import { noResults } from "../../validators/result-validators.js"; import mysql from "../../adapters/mysql.js"; -import { errorHandler } from "../../utils/errors"; +import { errorHandler } from "../../utils/errors.js"; const getCoordinatesListController = (req, res, next, config) => { const conn = mysql.start(config) diff --git a/src/controllers/resource_types/placesController.js b/src/controllers/resource_types/placesController.js index a949d2e..17973bc 100644 --- a/src/controllers/resource_types/placesController.js +++ b/src/controllers/resource_types/placesController.js @@ -4,9 +4,8 @@ import { insertPlaceModel, modifyPlaceModel, deletePlaceModel - } from "../../models/resource_types/placesModel"; +} from "../../models/resource_types/placesModel.js"; import { error404 } from "../../utils/errors.js" -import { sendResponseNotFound } from "../../utils/responses.js" import { noResults } from "../../validators/result-validators.js" import mysql from "../../adapters/mysql.js" import { errorHandler } from "../../utils/errors.js" diff --git a/src/controllers/resource_types/reportTypesController.js b/src/controllers/resource_types/reportTypesController.js index 09959c8..4eaa61b 100644 --- a/src/controllers/resource_types/reportTypesController.js +++ b/src/controllers/resource_types/reportTypesController.js @@ -6,9 +6,9 @@ import { noResults } from "../../validators/result-validators.js"; import { getReportTypesListModel, countReportTypesListModel, - insertReportTypesListModel, - modifyReportTypesListModel, - softDeleteReportTypesListModel + insertReportTypesModel, + modifyReportTypesModel, + softDeleteReportTypesModel } from "../../models/resource_types/reportTypesModel.js"; const getReportTypesListController = (req, res, next, config) => { @@ -69,7 +69,7 @@ const postReportTypesController = (req, res, next, config) => { const conn = mysql.start(config); const created_by = req.auth.user || null - insertReportTypesListModel({ ...req.body, created_by, conn }) + insertReportTypesModel({ ...req.body, created_by, conn }) .then((response) => { const result = { _data: { @@ -91,7 +91,7 @@ const putReportTypesController = (req, res, next, config) => { const conn = mysql.start(config); const uuid_report_type = req.params.uuid; - modifyReportTypesListModel({ ...req.body, uuid: uuid_report_type, conn }) + modifyReportTypesModel({ ...req.body, uuid: uuid_report_type, conn }) .then((response) => { const result = { _data: { @@ -114,7 +114,7 @@ const softDeleteReportTypesController = (req, res, next, config) => { const uuid_report_type = req.params.uuid; const deleted_by = req.auth.user || null - softDeleteReportTypesListModel({ uuid: uuid_report_type, deleted_by, conn }) + softDeleteReportTypesModel({ uuid: uuid_report_type, deleted_by, conn }) .then(() => { const result = {} next(result); diff --git a/src/controllers/resource_types/usersHasPlacesController.js b/src/controllers/resource_types/usersHasPlacesController.js index 7c30b26..df9d4c2 100644 --- a/src/controllers/resource_types/usersHasPlacesController.js +++ b/src/controllers/resource_types/usersHasPlacesController.js @@ -4,7 +4,7 @@ import { insertUserHasPlacesModel, modifyUserHasPlacesModel, softDeleteUserHasPlacesModel -} from "../../models/resource_types/usersHasPlacesModel"; +} from "../../models/resource_types/usersHasPlacesModel.js"; import { error404 } from "../../utils/errors.js" import { sendResponseNotFound } from "../../utils/responses.js" import { noResults } from "../../validators/result-validators.js" diff --git a/src/models/resource_types/coordinatesModel.js b/src/models/resource_types/coordinatesModel.js index fef13b9..76d3df6 100644 --- a/src/models/resource_types/coordinatesModel.js +++ b/src/models/resource_types/coordinatesModel.js @@ -4,7 +4,7 @@ import { insertCoordinatesQuery, updateCoordinatesQuery, softDeleteCoordinatesQuery -} from "../../repositories/resource_types/coordinatesRepository"; +} from "../../repositories/resource_types/coordinatesRepository.js"; import { randomUUID as uuidv4 } from 'node:crypto' import dayjs from 'dayjs' import mysql from '../../adapters/mysql.js' diff --git a/src/models/resource_types/placesModel.js b/src/models/resource_types/placesModel.js index 498190c..bee64fa 100644 --- a/src/models/resource_types/placesModel.js +++ b/src/models/resource_types/placesModel.js @@ -4,7 +4,7 @@ import { insertPlaceQuery, updatePlaceQuery, deletePlaceQuery -} from "../../repositories/resource_types/placesRepository"; +} from "../../repositories/resource_types/placesRepository.js"; import { randomUUID as uuidv4 } from 'node:crypto' import dayjs from 'dayjs' import mysql from '../../adapters/mysql.js' @@ -56,7 +56,6 @@ const deletePlaceModel = ({uuid, deleted, deletedBy, conn}) => { export { getPlaceListModel, countPlaceListModel, - getPlaceByUuidModel, insertPlaceModel, modifyPlaceModel, deletePlaceModel diff --git a/src/models/resource_types/reportTypesModel.js b/src/models/resource_types/reportTypesModel.js index a09b9cb..0be7865 100644 --- a/src/models/resource_types/reportTypesModel.js +++ b/src/models/resource_types/reportTypesModel.js @@ -4,7 +4,7 @@ import { insertReportTypesQuery, updateReportTypesQuery, softDeleteReportTypesQuery, -} from "../../repositories/resource_types/reportTypesRepository"; +} from "../../repositories/resource_types/reportTypesRepository.js"; import { randomUUID as uuidv4 } from 'node:crypto' import dayjs from 'dayjs' import mysql from '../../adapters/mysql.js' diff --git a/src/models/resource_types/usersHasPlacesModel.js b/src/models/resource_types/usersHasPlacesModel.js index 5ef4b96..94fc5da 100644 --- a/src/models/resource_types/usersHasPlacesModel.js +++ b/src/models/resource_types/usersHasPlacesModel.js @@ -1,5 +1,5 @@ import { getUserHasPlacesListQuery, countUserHasPlacesListQuery, insertUserHasPlacesQuery, modifyUserHasPlacesQuery, softDeleteUserHasPlacesQuery -} from "../../repositories/resource_types/usersHasPlacesRepository"; +} from "../../repositories/resource_types/usersHasPlacesRepository.js"; import { randomUUID as uuidv4 } from 'node:crypto' import dayjs from 'dayjs' import mysql from '../../adapters/mysql.js' diff --git a/src/repositories/resource_types/coordinatesRepository.js b/src/repositories/resource_types/coordinatesRepository.js index 209e6eb..d820902 100644 --- a/src/repositories/resource_types/coordinatesRepository.js +++ b/src/repositories/resource_types/coordinatesRepository.js @@ -1,4 +1,4 @@ -import { pagination } from "../../utils/pagination"; +import { pagination } from "../../utils/pagination.js"; const _coordinatesSelectQuery = (_pagination = '') => ({ count }) => ({ uuid, latitude, longitude }) => { const uuidCondition = uuid ? 'AND c.uuid = :uuid ' : ''; diff --git a/src/repositories/resource_types/reportTypesRepository.js b/src/repositories/resource_types/reportTypesRepository.js index 379f616..8e18a01 100644 --- a/src/repositories/resource_types/reportTypesRepository.js +++ b/src/repositories/resource_types/reportTypesRepository.js @@ -1,4 +1,4 @@ -import { pagination } from "../../utils/pagination"; +import { pagination } from "../../utils/pagination.js"; const _coordinatesSelectQuery = (_pagination = '') => ({ count }) => ({ uuid, name }) => { const uuidCondition = uuid ? 'AND rt.uuid = :uuid ' : ''; diff --git a/src/repositories/resource_types/usersHasPlacesRepository.js b/src/repositories/resource_types/usersHasPlacesRepository.js index 9a5389d..57d0c43 100644 --- a/src/repositories/resource_types/usersHasPlacesRepository.js +++ b/src/repositories/resource_types/usersHasPlacesRepository.js @@ -1,4 +1,4 @@ -import { pagination } from "../../utils/pagination"; +import { pagination } from "../../utils/pagination.js"; //reports repository const _userHasPlacesSelectQuery = (_pagination = '') => ({ count }) => ({ uuid, uuidUser, uuidPlace, uuidReportType }) => { const uuidCondition = uuid ? 'AND up.uuid = :uuid ' : '';