From b9f7167d21314e2ba6878462c1596bfede551b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadeusz=20Miesi=C4=85c?= <tadeusz.miesiac@gmail.com>
Date: Mon, 23 Oct 2023 20:30:00 +0800
Subject: [PATCH] feat(models): fixes from pr

---
 src/models/bioEntitySchema.ts                  | 6 +++---
 src/redux/bioEntity/bioEntity.reducers.test.ts | 4 ++--
 src/redux/bioEntity/bioEntity.thunks.test.ts   | 4 ++--
 src/redux/bioEntity/bioEntity.thunks.ts        | 4 ++--
 src/services/api/utils/axiosInstance.ts        | 2 +-
 src/utils/mockNetworkResponse.ts               | 6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/models/bioEntitySchema.ts b/src/models/bioEntitySchema.ts
index fd0ee6a1..51f1880c 100644
--- a/src/models/bioEntitySchema.ts
+++ b/src/models/bioEntitySchema.ts
@@ -32,7 +32,7 @@ export const bioEntitySchema = z.object({
   transparencyLevel: z.string(),
   synonyms: z.array(z.string()),
   formerSymbols: z.array(z.string()),
-  fullName: z.string(),
+  fullName: z.string().nullable(),
   abbreviation: z.string().nullable(),
   formula: z.string().nullable(),
   glyph: glyphSchema.nullable(),
@@ -58,8 +58,8 @@ export const bioEntitySchema = z.object({
   fillColor: colorSchema,
   borderColor: colorSchema,
   smiles: z.optional(z.string()),
-  inChI: z.optional(z.string()),
-  inChIKey: z.optional(z.string()),
+  inChI: z.optional(z.string().nullable()),
+  inChIKey: z.optional(z.string().nullable()),
   thickness: z.optional(z.number()),
   outerWidth: z.optional(z.number()),
   innerWidth: z.optional(z.number()),
diff --git a/src/redux/bioEntity/bioEntity.reducers.test.ts b/src/redux/bioEntity/bioEntity.reducers.test.ts
index e73215b5..ed3afdbd 100644
--- a/src/redux/bioEntity/bioEntity.reducers.test.ts
+++ b/src/redux/bioEntity/bioEntity.reducers.test.ts
@@ -1,5 +1,5 @@
 import { bioEntityResponseFixture } from '@/models/fixtures/bioEntityContentsFixture';
-import { mockNetworkExperimentalAPIResponse } from '@/utils/mockNetworkResponse';
+import { mockNetworkNewAPIResponse } from '@/utils/mockNetworkResponse';
 import {
   ToolkitStoreWithSingleSlice,
   createStoreInstanceUsingSliceReducer,
@@ -10,7 +10,7 @@ import { getBioEntity } from './bioEntity.thunks';
 import bioEntityContentsReducer from './bioEntity.slice';
 import { BioEntityContentsState } from './bioEntity.types';
 
-const mockedAxiosClient = mockNetworkExperimentalAPIResponse();
+const mockedAxiosClient = mockNetworkNewAPIResponse();
 const SEARCH_QUERY = 'park7';
 
 const INITIAL_STATE: BioEntityContentsState = {
diff --git a/src/redux/bioEntity/bioEntity.thunks.test.ts b/src/redux/bioEntity/bioEntity.thunks.test.ts
index f180cfe2..b5b51d28 100644
--- a/src/redux/bioEntity/bioEntity.thunks.test.ts
+++ b/src/redux/bioEntity/bioEntity.thunks.test.ts
@@ -1,5 +1,5 @@
 import { bioEntityResponseFixture } from '@/models/fixtures/bioEntityContentsFixture';
-import { mockNetworkExperimentalAPIResponse } from '@/utils/mockNetworkResponse';
+import { mockNetworkNewAPIResponse } from '@/utils/mockNetworkResponse';
 import {
   ToolkitStoreWithSingleSlice,
   createStoreInstanceUsingSliceReducer,
@@ -10,7 +10,7 @@ import { getBioEntity } from './bioEntity.thunks';
 import contentsReducer from './bioEntity.slice';
 import { BioEntityContentsState } from './bioEntity.types';
 
-const mockedAxiosClient = mockNetworkExperimentalAPIResponse();
+const mockedAxiosClient = mockNetworkNewAPIResponse();
 const SEARCH_QUERY = 'park7';
 
 describe('bioEntityContents thunks', () => {
diff --git a/src/redux/bioEntity/bioEntity.thunks.ts b/src/redux/bioEntity/bioEntity.thunks.ts
index fbc7c2e0..c1759481 100644
--- a/src/redux/bioEntity/bioEntity.thunks.ts
+++ b/src/redux/bioEntity/bioEntity.thunks.ts
@@ -1,5 +1,5 @@
 import { createAsyncThunk } from '@reduxjs/toolkit';
-import { axiosInstanceExperimentalAPI } from '@/services/api/utils/axiosInstance';
+import { axiosInstanceNewAPI } from '@/services/api/utils/axiosInstance';
 import { BioEntityContent, BioEntityResponse } from '@/types/models';
 import { validateDataUsingZodSchema } from '@/utils/validateDataUsingZodSchema';
 import { apiPath } from '@/redux/apiPath';
@@ -8,7 +8,7 @@ import { bioEntityResponseSchema } from '@/models/bioEntityResponseSchema';
 export const getBioEntity = createAsyncThunk(
   'project/getBioEntityContents',
   async (searchQuery: string): Promise<BioEntityContent[] | undefined> => {
-    const response = await axiosInstanceExperimentalAPI.get<BioEntityResponse>(
+    const response = await axiosInstanceNewAPI.get<BioEntityResponse>(
       apiPath.getBioEntityContentsStringWithQuery(searchQuery),
     );
 
diff --git a/src/services/api/utils/axiosInstance.ts b/src/services/api/utils/axiosInstance.ts
index 67e1f618..aaa17d28 100644
--- a/src/services/api/utils/axiosInstance.ts
+++ b/src/services/api/utils/axiosInstance.ts
@@ -5,6 +5,6 @@ export const axiosInstance = axios.create({
   baseURL: BASE_API_URL,
 });
 
-export const axiosInstanceExperimentalAPI = axios.create({
+export const axiosInstanceNewAPI = axios.create({
   baseURL: BASE_NEW_API_URL,
 });
diff --git a/src/utils/mockNetworkResponse.ts b/src/utils/mockNetworkResponse.ts
index 5da43a50..67077e02 100644
--- a/src/utils/mockNetworkResponse.ts
+++ b/src/utils/mockNetworkResponse.ts
@@ -1,13 +1,13 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
 import MockAdapter from 'axios-mock-adapter';
-import { axiosInstance, axiosInstanceExperimentalAPI } from '@/services/api/utils/axiosInstance';
+import { axiosInstance, axiosInstanceNewAPI } from '@/services/api/utils/axiosInstance';
 
 export const mockNetworkResponse = (): MockAdapter => {
   const mock = new MockAdapter(axiosInstance);
   return mock;
 };
 
-export const mockNetworkExperimentalAPIResponse = (): MockAdapter => {
-  const mock = new MockAdapter(axiosInstanceExperimentalAPI);
+export const mockNetworkNewAPIResponse = (): MockAdapter => {
+  const mock = new MockAdapter(axiosInstanceNewAPI);
   return mock;
 };
-- 
GitLab