From b0eb55a31b3d05da17b74c0aef387f1dbba3519a Mon Sep 17 00:00:00 2001 From: Roman Kalyakin Date: Fri, 17 Jan 2025 10:34:26 +0100 Subject: [PATCH] renamed iamge service to v1 --- .../images/{images.class.js => images-v1.class.js} | 8 +------- .../images/{images.hooks.ts => images-v1.hooks.ts} | 2 +- src/services/images/images.service.js | 9 ++++----- test/integration/use_cases/permissions.test.ts | 2 +- 4 files changed, 7 insertions(+), 14 deletions(-) rename src/services/images/{images.class.js => images-v1.class.js} (98%) rename src/services/images/{images.hooks.ts => images-v1.hooks.ts} (98%) diff --git a/src/services/images/images.class.js b/src/services/images/images-v1.class.js similarity index 98% rename from src/services/images/images.class.js rename to src/services/images/images-v1.class.js index b512e290..16678aea 100644 --- a/src/services/images/images.class.js +++ b/src/services/images/images-v1.class.js @@ -11,7 +11,7 @@ const { SolrNamespaces, } = require('../../solr') -class Service { +export default class Service { constructor({ app = null, name = '' }) { this.app = app this.name = name @@ -285,9 +285,3 @@ class Service { return { id } } } - -module.exports = function (options) { - return new Service(options) -} - -module.exports.Service = Service diff --git a/src/services/images/images.hooks.ts b/src/services/images/images-v1.hooks.ts similarity index 98% rename from src/services/images/images.hooks.ts rename to src/services/images/images-v1.hooks.ts index 87fff0c1..8f979232 100644 --- a/src/services/images/images.hooks.ts +++ b/src/services/images/images-v1.hooks.ts @@ -98,7 +98,7 @@ export default { }, randomPage: { required: false, - transform: d => ['true', ''].includes(d), + transform: (d: string) => ['true', ''].includes(d), }, facets: utils.facets({ values: { diff --git a/src/services/images/images.service.js b/src/services/images/images.service.js index a14b7acb..680dbac6 100644 --- a/src/services/images/images.service.js +++ b/src/services/images/images.service.js @@ -1,12 +1,11 @@ -// Initializes the `images` service on path `/images` -import hooks from './images.hooks' -const createService = require('./images.class.js') +import hooksV1 from './images-v1.hooksoks' +import ServiceV1 from './images-v1.class' module.exports = function (app) { // Initialize our service with any options it requires app.use( '/images', - createService({ + new ServiceV1({ app, name: 'images', }) @@ -15,5 +14,5 @@ module.exports = function (app) { // Get our initialized service so that we can register hooks const service = app.service('images') - service.hooks(hooks) + service.hooks(hooksV1) } diff --git a/test/integration/use_cases/permissions.test.ts b/test/integration/use_cases/permissions.test.ts index 3eef00e9..30487fbe 100644 --- a/test/integration/use_cases/permissions.test.ts +++ b/test/integration/use_cases/permissions.test.ts @@ -16,7 +16,7 @@ import { contentItemRedactionPolicyWebApp, } from '../../../src/services/articles/articles.hooks' import { trPassageRedactionPolicy } from '../../../src/services/text-reuse-passages/text-reuse-passages.hooks' -import { imageRedactionPolicyWebApp } from '../../../src/services/images/images.hooks' +import { imageRedactionPolicyWebApp } from '../../../src/services/images/images-v1.hooks' import { DefaultConverters, RedactionPolicy } from '../../../src/util/redaction' import { JSONPath } from 'jsonpath-plus' import { SolrNamespaces } from '../../../src/solr'