diff --git a/apps/api/src/proxy/proxy.controller.ts b/apps/api/src/proxy/proxy.controller.ts index a803cc8..36cf2a7 100644 --- a/apps/api/src/proxy/proxy.controller.ts +++ b/apps/api/src/proxy/proxy.controller.ts @@ -61,7 +61,7 @@ export class ProxyController { return reply.send(data); } - @Get('/queries') + @Get('/get-queries') public async getQueriesList(@Res() reply: FastifyReply) { const res = await this.getAllQueries(); @@ -110,7 +110,7 @@ export class ProxyController { } } - @Get('/get-query-value') + @Get('/get-query') public async getQueryValue( @Query('queryKey') queryKey: string, @Res() reply: FastifyReply, diff --git a/apps/web/api/cache/query.ts b/apps/web/api/cache/query.ts index 6c8c7d6..070f59f 100644 --- a/apps/web/api/cache/query.ts +++ b/apps/web/api/cache/query.ts @@ -7,7 +7,7 @@ const { URL_CACHE_GET_QUERIES, URL_CACHE_DELETE_QUERY, URL_CACHE_RESET_QUERIES, - URL_CACHE_GET_QUERY_VALUE, + URL_CACHE_GET_QUERY, } = getUrls(); export function getQueries({ signal }: { signal: AbortSignal }) { @@ -32,7 +32,7 @@ export function reset() { export function getQueryValue(queryKey: string, { signal }: { signal: AbortSignal }) { return withHandleError( - axios.get(URL_CACHE_GET_QUERY_VALUE, { + axios.get(URL_CACHE_GET_QUERY, { params: { queryKey, }, diff --git a/apps/web/config/schema/env.js b/apps/web/config/schema/env.js index 0146e5e..c665f61 100644 --- a/apps/web/config/schema/env.js +++ b/apps/web/config/schema/env.js @@ -9,7 +9,7 @@ const envSchema = z.object({ URL_1C_TRANSTAX_DIRECT: z.string(), URL_CACHE_DELETE_QUERY_DIRECT: z.string(), URL_CACHE_GET_QUERIES_DIRECT: z.string(), - URL_CACHE_GET_QUERY_VALUE_DIRECT: z.string(), + URL_CACHE_GET_QUERY_DIRECT: z.string(), URL_CACHE_RESET_QUERIES_DIRECT: z.string(), URL_CORE_CALCULATE_DIRECT: z.string(), URL_CORE_FINGAP_DIRECT: z.string(), diff --git a/apps/web/config/schema/runtime-config.js b/apps/web/config/schema/runtime-config.js index 9b65b82..ed5c1eb 100644 --- a/apps/web/config/schema/runtime-config.js +++ b/apps/web/config/schema/runtime-config.js @@ -15,7 +15,7 @@ const serverRuntimeConfigSchema = envSchema.pick({ URL_1C_TRANSTAX_DIRECT: true, URL_CACHE_DELETE_QUERY_DIRECT: true, URL_CACHE_GET_QUERIES_DIRECT: true, - URL_CACHE_GET_QUERY_VALUE_DIRECT: true, + URL_CACHE_GET_QUERY_DIRECT: true, URL_CACHE_RESET_QUERIES_DIRECT: true, URL_CORE_CALCULATE_DIRECT: true, URL_CORE_FINGAP_DIRECT: true, diff --git a/apps/web/config/urls.ts b/apps/web/config/urls.ts index 94ede38..f06c419 100644 --- a/apps/web/config/urls.ts +++ b/apps/web/config/urls.ts @@ -25,7 +25,7 @@ function getUrls() { URL_CACHE_GET_QUERIES_DIRECT, URL_CACHE_DELETE_QUERY_DIRECT, URL_CACHE_RESET_QUERIES_DIRECT, - URL_CACHE_GET_QUERY_VALUE_DIRECT, + URL_CACHE_GET_QUERY_DIRECT, } = serverRuntimeConfigSchema.parse(serverRuntimeConfig); return { @@ -35,7 +35,7 @@ function getUrls() { URL_1C_TRANSTAX: URL_1C_TRANSTAX_DIRECT, URL_CACHE_DELETE_QUERY: URL_CACHE_DELETE_QUERY_DIRECT, URL_CACHE_GET_QUERIES: URL_CACHE_GET_QUERIES_DIRECT, - URL_CACHE_GET_QUERY_VALUE: URL_CACHE_GET_QUERY_VALUE_DIRECT, + URL_CACHE_GET_QUERY: URL_CACHE_GET_QUERY_DIRECT, URL_CACHE_RESET_QUERIES: URL_CACHE_RESET_QUERIES_DIRECT, URL_CORE_CALCULATE: URL_CORE_CALCULATE_DIRECT, URL_CORE_FINGAP: URL_CORE_FINGAP_DIRECT, @@ -54,7 +54,7 @@ function getUrls() { URL_1C_TRANSTAX: withBasePath(urls.URL_1C_TRANSTAX_PROXY), URL_CACHE_DELETE_QUERY: withBasePath(urls.URL_CACHE_DELETE_QUERY_PROXY), URL_CACHE_GET_QUERIES: withBasePath(urls.URL_CACHE_GET_QUERIES_PROXY), - URL_CACHE_GET_QUERY_VALUE: withBasePath(urls.URL_CACHE_GET_QUERY_VALUE_PROXY), + URL_CACHE_GET_QUERY: withBasePath(urls.URL_CACHE_GET_QUERY_PROXY), URL_CACHE_RESET_QUERIES: withBasePath(urls.URL_CACHE_RESET_QUERIES_PROXY), URL_CORE_CALCULATE: withBasePath(urls.URL_CORE_CALCULATE_PROXY), URL_CORE_FINGAP: withBasePath(urls.URL_CORE_FINGAP_PROXY), diff --git a/apps/web/constants/urls.js b/apps/web/constants/urls.js index ff905fd..e20cd01 100644 --- a/apps/web/constants/urls.js +++ b/apps/web/constants/urls.js @@ -1,9 +1,8 @@ module.exports = { URL_1C_TRANSTAX_PROXY: '/api/1c/transtax', - URL_CACHE_DELETE_QUERIES_BY_KEY_PROXY: '/api/admin/cache/delete-queries-by-key', URL_CACHE_DELETE_QUERY_PROXY: '/api/admin/cache/delete', - URL_CACHE_GET_QUERIES_PROXY: '/api/admin/cache/queries', - URL_CACHE_GET_QUERY_VALUE_PROXY: '/api/admin/cache/get-query-value', + URL_CACHE_GET_QUERIES_PROXY: '/api/admin/cache/get-queries', + URL_CACHE_GET_QUERY_PROXY: '/api/admin/cache/get-query', URL_CACHE_RESET_QUERIES_PROXY: '/api/admin/cache/reset', URL_CORE_CALCULATE_PROXY: '/api/core/calculate', URL_CORE_FINGAP_PROXY: '/api/core/fingap', diff --git a/apps/web/next.config.js b/apps/web/next.config.js index 261cdb9..aa95251 100644 --- a/apps/web/next.config.js +++ b/apps/web/next.config.js @@ -79,8 +79,8 @@ module.exports = withSentryConfig( source: urls.URL_CACHE_RESET_QUERIES_PROXY, }, { - destination: env.URL_CACHE_GET_QUERY_VALUE_DIRECT, - source: urls.URL_CACHE_GET_QUERY_VALUE_PROXY, + destination: env.URL_CACHE_GET_QUERY_DIRECT, + source: urls.URL_CACHE_GET_QUERY_PROXY, }, ...favicons.map((fileName) => buildFaviconRewrite(`/${fileName}`)), ];