format

nimarion · Oct 29, 2024 · 055e05f · 055e05f
1 parent 28b7850
commit 055e05f
Show file tree

Hide file tree

Showing 18 changed files with 910 additions and 766 deletions.
diff --git a/src/athlete_representatives/athlete_representative.zod.ts b/src/athlete_representatives/athlete_representative.zod.ts
@@ -1,4 +1,9 @@
-import { formatIncompletePhoneNumber, isValidPhoneNumber, parseIncompletePhoneNumber, parsePhoneNumberWithError } from 'libphonenumber-js/max';
+import {
+  formatIncompletePhoneNumber,
+  isValidPhoneNumber,
+  parseIncompletePhoneNumber,
+  parsePhoneNumberWithError,
+} from 'libphonenumber-js/max';
 import { LastnameSchema } from 'src/zod.schema';
 import { z } from 'zod';
 
@@ -28,29 +33,35 @@ export const AthleteRepresentative = z.object({
   countryCode: z.string().nullable(),
   firstName: z.string(),
   lastName: LastnameSchema,
-  email: z.array(z.string().nullable()).optional().default([]).transform((val) => {
-    if(val.length === 0) return null;
-    return sanitizeEmail(
-      val[0],
-    ) as string;
-  }),
-  mobile: z.array(z.string().nullable()).optional().default([]).transform((val) => {
-    if(val.length === 0) return null;
-    if(!isValidPhoneNumber(val[0], 'US')) {
-      if(isValidPhoneNumber(parseIncompletePhoneNumber(val[0]), 'US')) {
-        val[0] = formatIncompletePhoneNumber(val[0]);
-      } else {
-        console.error("invalid phone number", val[0]);
+  email: z
+    .array(z.string().nullable())
+    .optional()
+    .default([])
+    .transform((val) => {
+      if (val.length === 0) return null;
+      return sanitizeEmail(val[0]) as string;
+    }),
+  mobile: z
+    .array(z.string().nullable())
+    .optional()
+    .default([])
+    .transform((val) => {
+      if (val.length === 0) return null;
+      if (!isValidPhoneNumber(val[0], 'US')) {
+        if (isValidPhoneNumber(parseIncompletePhoneNumber(val[0]), 'US')) {
+          val[0] = formatIncompletePhoneNumber(val[0]);
+        } else {
+          console.error('invalid phone number', val[0]);
+          return null;
+        }
+      }
+      try {
+        const phoneNumber = parsePhoneNumberWithError(val[0], 'US');
+        if (!phoneNumber) return null;
+        return phoneNumber.formatInternational();
+      } catch (error) {
+        console.error('error parsing phone number', val[0]);
         return null;
       }
-    }
-    try {
-      const phoneNumber = parsePhoneNumberWithError(val[0], 'US');
-      if(!phoneNumber) return null;
-      return phoneNumber.formatInternational();
-    } catch (error) {
-      console.error("error parsing phone number", val[0]);
-      return null;
-    }
-  }),
+    }),
 });
diff --git a/src/athletes/athlete.zod.ts b/src/athletes/athlete.zod.ts
@@ -1,4 +1,11 @@
-import { CompetitionNameSchema, DateSchema, LastnameSchema, MarkSchema, PlaceSchema, StringNumberSchema } from 'src/zod.schema';
+import {
+  CompetitionNameSchema,
+  DateSchema,
+  LastnameSchema,
+  MarkSchema,
+  PlaceSchema,
+  StringNumberSchema,
+} from 'src/zod.schema';
 import { z } from 'zod';
 
 export const BasicData = z.object({
@@ -61,11 +68,11 @@ export const Athlete = z.object({
       categoryName: z.string(),
     }),
   ),
-  athleteRepresentative: z.nullable(z.object({ _id: z.number() })).transform(
-    (val) => {
+  athleteRepresentative: z
+    .nullable(z.object({ _id: z.number() }))
+    .transform((val) => {
       return val?._id ?? null;
-    },
-  ),
+    }),
 });
 
 export const AthleteSearchSchema = z.object({
@@ -74,11 +81,7 @@ export const AthleteSearchSchema = z.object({
   givenName: z.string(),
   birthDate: DateSchema,
   gender: z.string().transform((val) => {
-    return val === 'Men'
-    ? 'MALE'
-    : val === 'Women'
-      ? 'FEMALE'
-      : null
+    return val === 'Men' ? 'MALE' : val === 'Women' ? 'FEMALE' : null;
   }),
   country: z.string(),
 });
diff --git a/src/athletes/athletes.controller.ts b/src/athletes/athletes.controller.ts
@@ -5,6 +5,7 @@ import {
   ParseIntPipe,
   NotFoundException,
   Query,
+  BadRequestException,
 } from '@nestjs/common';
 import { AthletesService } from './athletes.service';
 import { ApiOkResponse, ApiNotFoundResponse, ApiQuery } from '@nestjs/swagger';
@@ -26,13 +27,9 @@ export class AthletesController {
     @Query('name') name: string,
   ): Promise<AthleteSearchResult[]> {
     if (!name) {
-      throw new NotFoundException();
+      throw new BadRequestException('Query parameter "name" is required');
     }
-    const athlete = await this.athletesService.searchAthlete(name);
-    if (!athlete) {
-      throw new NotFoundException();
-    }
-    return athlete;
+    return await this.athletesService.searchAthlete(name);
   }
 
   @Get(':id')
@@ -45,13 +42,14 @@ export class AthletesController {
     @Param('id', ParseIntPipe) id: number,
   ): Promise<Athlete> {
     if (id < 1 || id > 2147483647) {
-      throw new NotFoundException();
-    }
-    const athlete = await this.athletesService.getAthlete(id);
-    if (!athlete) {
-      throw new NotFoundException();
+      throw new BadRequestException('Invalid value for athlete id');
     }
-    return athlete;
+    return this.athletesService.getAthlete(id).then((athlete) => {
+      if (!athlete) {
+        throw new NotFoundException();
+      }
+      return athlete;
+    });
   }
 
   @Get(':id/results')