From 936ff0a761db5a852011d15778f0bab1cca34ba2 Mon Sep 17 00:00:00 2001 From: William Wills Date: Wed, 8 Jan 2025 16:39:41 -0500 Subject: [PATCH] fix: duplicated definitions --- src/models/address-book/address-book.mock.js | 2 +- src/validations/address-book-validations.js | 6 +++--- src/validations/projects.validations.js | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/models/address-book/address-book.mock.js b/src/models/address-book/address-book.mock.js index 52106643..1aa11224 100644 --- a/src/models/address-book/address-book.mock.js +++ b/src/models/address-book/address-book.mock.js @@ -1,5 +1,5 @@ import stub from './address-book.stub.js'; -export const StatisticsMock = { +export const AddressBookMock = { findAll: () => stub, }; diff --git a/src/validations/address-book-validations.js b/src/validations/address-book-validations.js index bbbbaa7f..ea69d7c4 100644 --- a/src/validations/address-book-validations.js +++ b/src/validations/address-book-validations.js @@ -1,7 +1,7 @@ import Joi from 'joi'; import { genericSortColumnRegex } from '../utils/string-utils'; -export const baseSchema = { +export const addressBookBaseSchema = { name: Joi.string().required(), walletAddress: Joi.string().required(), }; @@ -17,12 +17,12 @@ export const addressBookGetQuerySchema = Joi.object() .with('limit', 'page'); export const addressBookPostSchema = Joi.object({ - ...baseSchema, + ...addressBookBaseSchema, }); export const addressBookUpdateSchema = Joi.object({ id: Joi.string().required(), - ...baseSchema, + ...addressBookBaseSchema, }); export const addressBookDeleteSchema = Joi.object({ diff --git a/src/validations/projects.validations.js b/src/validations/projects.validations.js index c64aae89..f7fe36c8 100644 --- a/src/validations/projects.validations.js +++ b/src/validations/projects.validations.js @@ -1,12 +1,12 @@ import Joi from 'joi'; import { cobenefitSchema, + estimationSchema, + issuanceSchema, + labelSchema, locationSchema, ratingSchema, relatedProjectSchema, - labelSchema, - issuanceSchema, - estimationSchema, } from '../validations'; import { @@ -16,7 +16,7 @@ import { import { pickListValidation } from '../utils/validation-utils'; -export const baseSchema = { +export const projectsBaseSchema = { // warehouseProjectId - derived upon creation // orgUid - derived upon creation currentRegistry: Joi.string().allow(null).optional(), @@ -84,12 +84,12 @@ export const projectsGetQuerySchema = Joi.object() .with('limit', 'page'); export const projectsPostSchema = Joi.object({ - ...baseSchema, + ...projectsBaseSchema, }); export const projectsUpdateSchema = Joi.object({ warehouseProjectId: Joi.string().required(), - ...baseSchema, + ...projectsBaseSchema, }); export const projectsDeleteSchema = Joi.object({