Merge pull request #133 from letehaha/fix/issues

fix: Minor issues
letehaha · Sep 16, 2024 · c3d86e7 · c3d86e7
2 parents 45fb4d8 + 1f16e0b
commit c3d86e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/docker/test/docker-compose.yml b/docker/test/docker-compose.yml
@@ -8,14 +8,12 @@ services:
       - POSTGRES_USER=${APPLICATION_DB_USERNAME}
       - POSTGRES_PASSWORD=${APPLICATION_DB_PASSWORD}
       - POSTGRES_DB=${APPLICATION_DB_DATABASE}
-    ports: ['${APPLICATION_DB_PORT}:5432']
     env_file: ../../.env.test
 
   test-redis:
     image: redis:6
     container_name: test-budget-tracker-redis
     volumes: ['test_redis_data:/data']
-    ports: ['6379:6379']
 
   test-runner:
     build:

diff --git a/src/controllers/categories.controller/create-category.ts b/src/controllers/categories.controller/create-category.ts
@@ -1,12 +1,12 @@
 import { z } from 'zod';
-import { API_RESPONSE_STATUS, CATEGORY_TYPES, endpointsTypes } from 'shared-types';
+import { API_RESPONSE_STATUS, CATEGORY_TYPES } from 'shared-types';
 import { CustomResponse } from '@common/types';
 import * as categoriesService from '@root/services/categories/create-category';
 import { errorHandler } from '../helpers';
 
 export const createCategory = async (req, res: CustomResponse) => {
   const { id: userId } = req.user;
-  const { name, imageUrl, color, parentId }: endpointsTypes.CreateCategoryBody = req.validated.body;
+  const { name, imageUrl, color, parentId }: CreateCategoryParams = req.validated.body;
 
   try {
     const data = await categoriesService.createCategory({
@@ -29,7 +29,7 @@ export const createCategory = async (req, res: CustomResponse) => {
 export const CreateCategoryPayloadSchema = z
   .object({
     name: z.string().min(1).max(200, 'The name must not exceed 200 characters'),
-    imageUrl: z.string().url().max(500, 'The URL must not exceed 500 characters').optional(),
+    imageUrl: z.string().url().max(500, 'The URL must not exceed 500 characters').nullish(),
     type: z
       .enum(Object.values(CATEGORY_TYPES) as [string, ...string[]])
       .default(CATEGORY_TYPES.custom),
@@ -41,7 +41,7 @@ export const CreateCategoryPayloadSchema = z
         color: z
           .string()
           .regex(/^#[0-9A-F]{6}$/i)
-          .optional(),
+          .nullish(),
       }),
       z.object({
         parentId: z.undefined(),
@@ -53,3 +53,5 @@ export const CreateCategoryPayloadSchema = z
 export const createCategorySchema = z.object({
   body: CreateCategoryPayloadSchema,
 });
+
+type CreateCategoryParams = z.infer<typeof CreateCategoryPayloadSchema>;