Pets

src/modules/health/patients/controllers/create.test.ts

@@ -30,6 +30,7 @@ describe("Create patient e2e", () => {
       id: expect.any(String),
       name: "Nina",
       birthdate: "2021-01-01",
+      sex: "FEMALE",
       specie: "Dog",
       breed: "German Shepherd",
     });

src/modules/health/patients/use-cases/create.test.ts

@@ -16,9 +16,9 @@ describe("Create patient use case", () => {
     const patient: CreatePatient = {
       name: "Nina",
       birthdate: "2021-01-01",
+      sex: "FEMALE",
       medicalObservations:
         "No prior medical conditions reported. Regular vaccinations up to date. Recent flea and tick prevention administered. Healthy and active upon initial examination.",
-      sex: "FEMALE",
       breed: "German Shepherd",
       specie: "Dog",
     };
@@ -29,9 +29,9 @@ describe("Create patient use case", () => {
       id: expect.any(String),
       name: "Nina",
       birthdate: "2021-01-01",
+      sex: "FEMALE",
       medicalObservations:
         "No prior medical conditions reported. Regular vaccinations up to date. Recent flea and tick prevention administered. Healthy and active upon initial examination.",
-      sex: "FEMALE",
       breed: "German Shepherd",
       specie: "Dog",
     });

src/modules/pet/pets/controllers/create.test.ts

@@ -20,8 +20,8 @@ describe("Create pet e2e", () => {
     const data: CreatePet = {
       name: "Nina",
       birthdate: "2021-01-01",
-      observations: "She's a very playful dog",
       sex: "FEMALE",
+      observations: "She's a very playful dog",
       speciesId: specie.id,
       breedId: breed.id,
     };
@@ -42,6 +42,7 @@ describe("Create pet e2e", () => {
       id: expect.any(String),
       name: "Nina",
       birthdate: "2021-01-01",
+      sex: "FEMALE",
       speciesId: specie.id,
       breedId: breed.id,
     });
@@ -64,6 +65,7 @@ describe("Create pet e2e", () => {
     const data: CreatePet = {
       name: "Nina",
       birthdate: "2021-01-01",
+      sex: "FEMALE",
       speciesId: "b38d7184-b9cf-4e79-acb6-6b7b8f797284", // Unregistered specie
       breedId: breed.id,
     };
@@ -93,6 +95,7 @@ describe("Create pet e2e", () => {
     const data: CreatePet = {
       name: "Nina",
       birthdate: "2021-01-01",
+      sex: "FEMALE",
       speciesId: specie.id,
       breedId: "b38d7184-b9cf-4e79-acb6-6b7b8f797284", // Unregistered breed
     };
@@ -133,6 +136,7 @@ describe("Create pet e2e", () => {
     const data: CreatePet = {
       name: "Nina",
       birthdate: "2021-01-01",
+      sex: "FEMALE",
       speciesId: specieDog.id,
       breedId: catBreed.id,
     };

src/modules/pet/pets/controllers/list.test.ts

@@ -21,6 +21,7 @@ describe("List pet e2e", () => {
     const createPet: CreatePet = {
       name: "Nina",
       birthdate: "2021-01-01",
+      sex: "FEMALE",
       speciesId: specie.id,
       breedId: breed.id,
     };
@@ -53,6 +54,7 @@ describe("List pet e2e", () => {
       id: expect.any(String),
       name: "Nina",
       birthdate: "2021-01-01",
+      sex: "FEMALE",
       speciesId: specie.id,
       breedId: breed.id,
     });
@@ -102,6 +104,7 @@ describe("List pet e2e", () => {
       const createPet: CreatePet = {
         name: `Nina-${i}`,
         birthdate: "2021-01-01",
+        sex: "FEMALE",
         speciesId: specie.id,
         breedId: breed.id,
       };
@@ -135,6 +138,7 @@ describe("List pet e2e", () => {
       id: expect.any(String),
       name: "Nina-10",
       birthdate: "2021-01-01",
+      sex: "FEMALE",
       speciesId: specie.id,
       breedId: breed.id,
     });

src/modules/pet/pets/controllers/list.ts

@@ -1,11 +1,11 @@
 import Elysia from "elysia";
-import { listPetSchema } from "../schema";
+import { listPetsSchema } from "../schema";
 import { makeListPetsUseCase } from "../factories/make-list";
 import { SpecieNotFoundError } from "../../shared/errors/specie-not-found";
 import { BreedNotFoundError } from "../../shared/errors/breed-not-found";
 import { InvalidBreedSpecieError } from "../../shared/errors/invalid-breed-specie";
 
-export const listPet = new Elysia()
+export const listPets = new Elysia()
   .error({
     SpecieNotFoundError,
     BreedNotFoundError,
@@ -21,6 +21,6 @@ export const listPet = new Elysia()
       return pets;
     },
     {
-      query: listPetSchema,
+      query: listPetsSchema,
     },
   );

src/modules/pet/pets/schema.ts

@@ -4,11 +4,9 @@ export const createPetSchema = t.Object({
   name: t.String(),
   birthdate: t.String({ format: "date" }),
   observations: t.Optional(t.String()),
-  sex: t.Optional(
-    t.Union([t.Literal("MALE"), t.Literal("FEMALE"), t.Literal("UNKNOWN")], {
-      default: "UNKNOWN",
-    }),
-  ),
+  sex: t.Union([t.Literal("MALE"), t.Literal("FEMALE"), t.Literal("UNKNOWN")], {
+    default: "UNKNOWN",
+  }),
   breedId: t.String({
     format: "uuid",
   }),
@@ -17,7 +15,7 @@ export const createPetSchema = t.Object({
   }),
 });
 
-export const listPetSchema = t.Object({
+export const listPetsSchema = t.Object({
   page: t.Integer({ minimum: 1 }),
   pageSize: t.Integer({ minimum: 1, maximum: 100, default: 10 }),
 });

src/modules/pet/pets/use-cases/create.test.ts

@@ -38,8 +38,8 @@ describe("Create pet use case", () => {
     const pet: CreatePet = {
       name: "Nina",
       birthdate: "2021-01-01",
-      observations: "She's a very playful dog",
       sex: "FEMALE",
+      observations: "She's a very playful dog",
       breedId: breed.id,
       speciesId: specie.id,
     };
@@ -50,8 +50,8 @@ describe("Create pet use case", () => {
       id: expect.any(String),
       name: "Nina",
       birthdate: "2021-01-01",
-      observations: "She's a very playful dog",
       sex: "FEMALE",
+      observations: "She's a very playful dog",
       breedId: breed.id,
       speciesId: specie.id,
     });
@@ -70,6 +70,7 @@ describe("Create pet use case", () => {
     const pet: CreatePet = {
       name: "Nina",
       birthdate: "2021-01-01",
+      sex: "FEMALE",
       breedId: breed.id,
       speciesId: "NonExistentSpecieId",
     };
@@ -87,6 +88,7 @@ describe("Create pet use case", () => {
     const pet: CreatePet = {
       name: "Nina",
       birthdate: "2021-01-01",
+      sex: "FEMALE",
       breedId: "NonExistentBreedId",
       speciesId: specie.id,
     };
@@ -113,6 +115,7 @@ describe("Create pet use case", () => {
     const pet: CreatePet = {
       name: "Nina",
       birthdate: "2021-01-01",
+      sex: "FEMALE",
       speciesId: specieDog.id,
       breedId: breedCat.id,
     };

src/modules/pet/pets/use-cases/list.test.ts

@@ -35,8 +35,8 @@ describe("Create pet use case", () => {
     const pet: CreatePet = {
       name: "Nina",
       birthdate: "2021-01-01",
-      observations: "She's a very playful dog",
       sex: "FEMALE",
+      observations: "She's a very playful dog",
       breedId: breed.id,
       speciesId: specie.id,
     };
@@ -52,8 +52,8 @@ describe("Create pet use case", () => {
       id: expect.any(String),
       name: "Nina",
       birthdate: "2021-01-01",
-      observations: "She's a very playful dog",
       sex: "FEMALE",
+      observations: "She's a very playful dog",
       breedId: breed.id,
       speciesId: specie.id,
     });

src/modules/pet/shared/routes.ts

@@ -2,12 +2,12 @@ import Elysia from "elysia";
 import { createPet } from "../pets/controllers/create";
 import { createBreed } from "../breeds/controllers/create";
 import { createSpecie } from "../species/controllers/create";
-import { listPet } from "../pets/controllers/list";
+import { listPets } from "../pets/controllers/list";
 
 const petRoutes = new Elysia();
 
 petRoutes.group("pet", (app) =>
-  app.use(createPet).use(listPet).use(createBreed).use(createSpecie),
+  app.use(createPet).use(listPets).use(createBreed).use(createSpecie),
 );
 
 export default petRoutes;