From 2b2ad786b2314b6d9370ab08da46fc6694a79918 Mon Sep 17 00:00:00 2001 From: SergeyVS Date: Tue, 2 Apr 2024 12:32:17 +0300 Subject: [PATCH] clear logs, added logger, replace cebab to camelcase --- users-manage/Makefile | 6 +++ users-manage/package.json | 1 + .../adapters/adapterOfServices/Services.js | 51 ++++++++++++------- .../src/adapters/adapterOfUsers/Users.js | 12 ++--- .../src/components/1_atoms/VDoubleSwitch.vue | 1 - .../ServicesList/EditServiceCard.vue | 13 +++-- .../3_organisms/ServicesList/ServiceCard.vue | 17 +++---- .../3_organisms/ServicesList/ServicesList.vue | 6 +-- .../3_organisms/UsersManager/UserEditor.vue | 1 - .../3_organisms/UsersManager/UsersManager.vue | 1 - .../UsersManager/helpers/validation.js | 1 - .../services/serviceOfServices/Services.js | 2 - .../src/services/serviceOfUsers/Users.js | 10 ---- .../src/services/serviceOfUsers/helpers.js | 1 - .../src/store/modules/services/index.js | 3 -- users-manage/src/store/modules/users/index.js | 6 --- .../src/useCases/CaseOfUsersInService.js | 2 - .../tests/services/serviceOfServices.test.js | 42 +++++++-------- users-manage/tests/store/services.test.js | 44 ++++++++-------- users-manage/tests/store/users.test.js | 8 +-- .../CaseOfUsersInService.test.js | 6 --- .../Services/EditServiceCard.test.js | 1 - .../3_organisms/Services/ServiceCard.test.js | 26 +++------- .../3_organisms/Services/ServicesList.test.js | 45 ++++++++-------- .../views/3_organisms/Users/StaticMocks.js | 1 - .../Users/UsersManagerUserEditor.test.js | 2 +- .../tests/views/5_pages/SitesList.test.js | 17 +++---- users-manage/yarn.lock | 3 ++ 28 files changed, 145 insertions(+), 184 deletions(-) diff --git a/users-manage/Makefile b/users-manage/Makefile index f778b9e..8e600de 100644 --- a/users-manage/Makefile +++ b/users-manage/Makefile @@ -42,6 +42,12 @@ prehook: @chmod +x $(HOOK_PATH) @echo "Pre-push hook set successfully." +add: +ifeq ($(pack),) + $(error mn is not set) +endif + yarn add "../repo/${pack}/" + push: ifeq ($(commit),) $(error mn is not set) diff --git a/users-manage/package.json b/users-manage/package.json index 285ad7e..2f97a45 100644 --- a/users-manage/package.json +++ b/users-manage/package.json @@ -15,6 +15,7 @@ "lint_fix": "yarn eslint './**/*.{js,vue}' --fix" }, "dependencies": { + "3-class-complex-assistants": "../repo/3-class-complex-assistants/", "axios": "^1.6.7", "flowbite": "^2.3.0", "flowbite-vue": "^0.1.2", diff --git a/users-manage/src/adapters/adapterOfServices/Services.js b/users-manage/src/adapters/adapterOfServices/Services.js index fcd28a5..fa5838e 100644 --- a/users-manage/src/adapters/adapterOfServices/Services.js +++ b/users-manage/src/adapters/adapterOfServices/Services.js @@ -1,32 +1,45 @@ import {get, post, put, remove} from './apiHelpers.js' import {convertList, convertObject} from '@helpers/adapter/adapter.js' +import {Logger} from '3-class-complex-assistants' +import moment from 'moment/moment.js' const config = { id: "id", - created_at: "created_at", - updated_at: "updated_at", - deleted_at: "deleted_at", + created_at: "createdAt", + updated_at: "updatedAt", + deleted_at: "deletedAt", name: "name", port: "port", - proxy_ip: "proxy_ip", - internet_uri: "internet_uri", + proxy_ip: "proxyIp", + internet_uri: "internetUri", description: "description", - is_online: "is_online", - site_ip: "device_ip", + is_online: "isOnline", + site_ip: "deviceIp", } const configToServer = { id: "id", - created_at: "created_at", - updated_at: "updated_at", - deleted_at: "deleted_at", + createdAt: "created_at", + updatedAt: "updated_at", + deletedAt: "deleted_at", name: "name", port: "port", - proxy_ip: "proxy_ip", - internet_uri: "internet_uri", + proxyIp: "proxy_ip", + internetUri: "internet_uri", description: "description", - is_online: "is_online", - device_ip: "site_ip", + isOnline: "is_online", + deviceIp: "site_ip", +} + +const loggerInfo = { + "loggerLevel": 1, + "serviceName": "users-manage", + "port": 5173, + "datetime": moment().format("YYYY-MM-DDTHH:mm:ss"), +} + +const callbackError = (error) => { + return console.err(error) } class Services { @@ -40,6 +53,7 @@ class Services { this.apiAddr = apiAddr this.config = config this.configToServer = configToServer + this.loggerConfig = {...loggerInfo, callFunc: callbackError, isPushToServer: true} } /** @@ -59,13 +73,14 @@ class Services { */ async createService(payload) { + const logger = new Logger(this.loggerConfig) let newService = [] const updatedPort = parseFloat(payload.port) const updatedService = {...convertObject(payload, {config: this.configToServer}), port: updatedPort} await post(`${this.apiAddr}/servers`, updatedService).then(res => { newService = convertObject(res.value, {config: this.config}) }).catch(err => { - console.log('err', err) + logger.error(err) }) return newService } @@ -77,6 +92,7 @@ class Services { */ async updateService(payload) { + const logger = new Logger(this.loggerConfig) let resService = [] const updatedPort = parseFloat(payload.port) const updatedService = {...convertObject(payload, {config: this.configToServer}), port: updatedPort} @@ -84,7 +100,7 @@ class Services { await put(`${this.apiAddr}/servers`, updatedService, payload.id).then(res => { resService = convertObject(res.value, {config: this.config}) }).catch(err => { - console.log('err', err) + logger.error(err) }) } return resService @@ -97,11 +113,12 @@ class Services { */ async deleteService(id) { + const logger = new Logger(this.loggerConfig) let deletedServiceId = null await remove(`${this.apiAddr}/servers`, id).then((res) => { deletedServiceId = res.id }).catch(err => { - console.log('err', err) + logger.error(err) }) return deletedServiceId } diff --git a/users-manage/src/adapters/adapterOfUsers/Users.js b/users-manage/src/adapters/adapterOfUsers/Users.js index a8aa35b..a1685ce 100644 --- a/users-manage/src/adapters/adapterOfUsers/Users.js +++ b/users-manage/src/adapters/adapterOfUsers/Users.js @@ -8,7 +8,7 @@ import {devUsersList} from './StaticData.js' * @param {Number} id */ -const adapter_config = { +const adapterConfig = { id: "id", first_name: "firstName", last_name: "lastName", @@ -17,7 +17,7 @@ const adapter_config = { service_id: "serviceId", } -const server_config = { +const serverConfig = { id: "id", firstName: "first_name", lastName: "last_name", @@ -35,8 +35,8 @@ class Users { */ constructor(apiAddr, params = {mode: 'prod'}) { this.apiAddr = apiAddr - this.config = adapter_config - this.server_config = server_config + this.config = adapterConfig + this.serverConfig = serverConfig this.mode = params.mode } @@ -76,7 +76,7 @@ class Users { * @returns {Promise} */ async createUser(userData) { - const newUser = await post(`${this.apiAddr}/users`, convertObject(userData, {config: this.server_config})) + const newUser = await post(`${this.apiAddr}/users`, convertObject(userData, {config: this.serverConfig})) return convertObject(newUser, {config: this.config}) } @@ -88,7 +88,7 @@ class Users { async updateUser(userData) { const updatedUserData = {...userData} delete updatedUserData.id - const newUser = await put(`${this.apiAddr}/users/${userData.id}`, convertObject(updatedUserData, {config: this.server_config})) + const newUser = await put(`${this.apiAddr}/users/${userData.id}`, convertObject(updatedUserData, {config: this.serverConfig})) return convertObject(newUser, {config: this.config}) } diff --git a/users-manage/src/components/1_atoms/VDoubleSwitch.vue b/users-manage/src/components/1_atoms/VDoubleSwitch.vue index ebe2189..63e7783 100644 --- a/users-manage/src/components/1_atoms/VDoubleSwitch.vue +++ b/users-manage/src/components/1_atoms/VDoubleSwitch.vue @@ -2,7 +2,6 @@ export default { name: 'VDoubleSwitch', components: { - // Button, }, props: { machine: { diff --git a/users-manage/src/components/3_organisms/ServicesList/EditServiceCard.vue b/users-manage/src/components/3_organisms/ServicesList/EditServiceCard.vue index d1d49c9..0aea71c 100644 --- a/users-manage/src/components/3_organisms/ServicesList/EditServiceCard.vue +++ b/users-manage/src/components/3_organisms/ServicesList/EditServiceCard.vue @@ -1,4 +1,3 @@ -