Type => Model

chubbyts · Mar 29, 2020 · 5d5c601 · 5d5c601
1 parent 03ce3c7
commit 5d5c601
Show file tree

Hide file tree

Showing 39 changed files with 76 additions and 76 deletions.
diff --git a/src/ApiClient/Pet.ts b/src/ApiClient/Pet.ts
@@ -1,12 +1,12 @@
-import BadRequest from '../Type/Error/BadRequest';
-import HttpError from '../Type/Error/HttpError';
-import InternalServerError from '../Type/Error/InternalServerError';
-import NetworkError from '../Type/Error/NetworkError';
-import NotFound from '../Type/Error/NotFound';
-import PetResponse from '../Type/Pet/PetResponse';
-import PetList from '../Type/Pet/PetList';
-import UnprocessableEntity from '../Type/Error/UnprocessableEntity';
-import PetRequest from '../Type/Pet/PetRequest';
+import BadRequest from '../Model/Error/BadRequest';
+import HttpError from '../Model/Error/HttpError';
+import InternalServerError from '../Model/Error/InternalServerError';
+import NetworkError from '../Model/Error/NetworkError';
+import NotFound from '../Model/Error/NotFound';
+import PetResponse from '../Model/Pet/PetResponse';
+import PetList from '../Model/Pet/PetList';
+import UnprocessableEntity from '../Model/Error/UnprocessableEntity';
+import PetRequest from '../Model/Pet/PetRequest';
 
 const url: string = `${process.env.REACT_APP_PETSTORE_URL}/api/pets`;
 

diff --git a/src/Component/Form/PetFilterForm.tsx b/src/Component/Form/PetFilterForm.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 import { Form, Button } from 'semantic-ui-react';
 import { useForm } from 'react-hook-form';
 import InvalidParameterByNameDenormalizer from '../../Denormalizer/InvalidParameterByNameDenormalizer';
-import PetFilterFormProps from '../../Type/Form/PetFilterFormProps';
-import PetFilters from '../../Type/Pet/PetFilters';
+import PetFilterFormProps from './PetFilterFormProps';
+import PetFilters from '../../Model/Pet/PetFilters';
 import TextField from './TextField';
 
 const PetFilterForm: React.FC<PetFilterFormProps> = ({ submitPetFilter, filters, error }: PetFilterFormProps) => {

diff --git a/src/Type/Form/PetFilterFormProps.ts → src/Component/Form/PetFilterFormProps.ts b/src/Type/Form/PetFilterFormProps.ts → src/Component/Form/PetFilterFormProps.ts
@@ -1,5 +1,5 @@
-import BadRequest from "../Error/BadRequest";
-import PetFilters from "../Pet/PetFilters";
+import BadRequest from "../../Model/Error/BadRequest";
+import PetFilters from "../../Model/Pet/PetFilters";
 
 type PetFilterFormProps = {
     submitPetFilter: { (filters: PetFilters): void; },

diff --git a/src/Component/Form/PetForm.tsx b/src/Component/Form/PetForm.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 import { Button, Form } from 'semantic-ui-react';
 import { useForm, useFieldArray } from 'react-hook-form';
 import InvalidParameterByNameDenormalizer from '../../Denormalizer/InvalidParameterByNameDenormalizer';
-import PetFormProps from '../../Type/Form/PetFormProps';
-import PetRequest from '../../Type/Pet/PetRequest';
+import PetFormProps from './PetFormProps';
+import PetRequest from '../../Model/Pet/PetRequest';
 import TextField from './TextField';
 
 const PetForm: React.FC<PetFormProps> = ({ submitPet, pet, error }: PetFormProps) => {

diff --git a/src/Component/Form/PetFormProps.ts b/src/Component/Form/PetFormProps.ts
@@ -0,0 +1,11 @@
+import PetRequest from "../../Model/Pet/PetRequest";
+import PetResponse from "../../Model/Pet/PetResponse";
+import UnprocessableEntity from "../../Model/Error/UnprocessableEntity";
+
+type PetFormProps = {
+    submitPet: { (pet: PetRequest): void; },
+    pet?: PetResponse,
+    error?: UnprocessableEntity
+};
+
+export default PetFormProps;
diff --git a/src/Component/Form/TextField.tsx b/src/Component/Form/TextField.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Form } from 'semantic-ui-react';
-import InvalidParameter from '../../Type/Error/InvalidParameter';
+import InvalidParameter from '../../Model/Error/InvalidParameter';
 
 type Props = {
     register: any,

diff --git a/src/Component/Page/Pet/Create.tsx b/src/Component/Page/Pet/Create.tsx
@@ -2,11 +2,11 @@ import React, { useState } from 'react';
 import { Button } from 'semantic-ui-react';
 import { CreatePet } from '../../../ApiClient/Pet';
 import { Link, useHistory } from 'react-router-dom';
-import HttpError from '../../../Type/Error/HttpError';
+import HttpError from '../../../Model/Error/HttpError';
 import HttpErrorPartial from '../../Partial/HttpError';
 import PetForm from '../../Form/PetForm';
-import UnprocessableEntity from '../../../Type/Error/UnprocessableEntity';
-import PetRequest from '../../../Type/Pet/PetRequest';
+import UnprocessableEntity from '../../../Model/Error/UnprocessableEntity';
+import PetRequest from '../../../Model/Pet/PetRequest';
 
 const Create: React.FC = () => {
 

diff --git a/src/Component/Page/Pet/List.tsx b/src/Component/Page/Pet/List.tsx
@@ -4,11 +4,11 @@ import { de } from 'date-fns/locale';
 import { format } from 'date-fns';
 import { Link, useHistory, useLocation } from 'react-router-dom';
 import { ListPets, DeletePet } from '../../../ApiClient/Pet';
-import BadRequest from '../../../Type/Error/BadRequest';
-import HttpError from '../../../Type/Error/HttpError';
+import BadRequest from '../../../Model/Error/BadRequest';
+import HttpError from '../../../Model/Error/HttpError';
 import HttpErrorPartial from '../../Partial/HttpError';
-import PetResponse from '../../../Type/Pet/PetResponse';
-import PetList from '../../../Type/Pet/PetList';
+import PetResponse from '../../../Model/Pet/PetResponse';
+import PetList from '../../../Model/Pet/PetList';
 import qs from 'qs';
 import PetFilterForm from '../../Form/PetFilterForm';
 

diff --git a/src/Component/Page/Pet/Read.tsx b/src/Component/Page/Pet/Read.tsx
@@ -4,9 +4,9 @@ import { de } from 'date-fns/locale';
 import { format } from 'date-fns';
 import { Link, RouteComponentProps } from 'react-router-dom';
 import { ReadPet } from '../../../ApiClient/Pet';
-import HttpError from '../../../Type/Error/HttpError';
+import HttpError from '../../../Model/Error/HttpError';
 import HttpErrorPartial from '../../Partial/HttpError';
-import PetResponse from '../../../Type/Pet/PetResponse';
+import PetResponse from '../../../Model/Pet/PetResponse';
 
 type Props = RouteComponentProps<{ id: string; }>;
 

diff --git a/src/Component/Page/Pet/Update.tsx b/src/Component/Page/Pet/Update.tsx
@@ -2,12 +2,12 @@ import React, { useState, useEffect } from 'react';
 import { Button } from 'semantic-ui-react';
 import { Link, RouteComponentProps, useHistory } from 'react-router-dom';
 import { ReadPet, UpdatePet } from '../../../ApiClient/Pet';
-import HttpError from '../../../Type/Error/HttpError';
+import HttpError from '../../../Model/Error/HttpError';
 import HttpErrorPartial from '../../Partial/HttpError';
-import PetResponse from '../../../Type/Pet/PetResponse';
+import PetResponse from '../../../Model/Pet/PetResponse';
 import PetForm from '../../Form/PetForm';
-import UnprocessableEntity from '../../../Type/Error/UnprocessableEntity';
-import PetRequest from '../../../Type/Pet/PetRequest';
+import UnprocessableEntity from '../../../Model/Error/UnprocessableEntity';
+import PetRequest from '../../../Model/Pet/PetRequest';
 
 type Props = RouteComponentProps<{ id: string; }>;
 

diff --git a/src/Component/Partial/HttpError.tsx b/src/Component/Partial/HttpError.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { Message } from 'semantic-ui-react';
-import HttpErrorType from '../../Type/Error/HttpError';
-import HttpErrorWithInvalidArguments from '../../Type/Error/HttpErrorWithInvalidArguments';
-import InvalidParameter from '../../Type/Error/InvalidParameter';
+import HttpErrorType from '../../Model/Error/HttpError';
+import HttpErrorWithInvalidArguments from '../../Model/Error/HttpErrorWithInvalidArguments';
+import InvalidParameter from '../../Model/Error/InvalidParameter';
 
 type Props = {
     httpError: HttpErrorType

diff --git a/src/Denormalizer/InvalidParameterByNameDenormalizer.ts b/src/Denormalizer/InvalidParameterByNameDenormalizer.ts
@@ -1,4 +1,4 @@
-import InvalidParameter from '../Type/Error/InvalidParameter';
+import InvalidParameter from '../Model/Error/InvalidParameter';
 
 type errorsByFieldsType = { [id: string]: Array<InvalidParameter>; };
 

diff --git a/src/Type/Error/BadRequest.ts → src/Model/Error/BadRequest.ts b/src/Type/Error/BadRequest.ts → src/Model/Error/BadRequest.ts
diff --git a/src/Type/Error/HttpError.ts → src/Model/Error/HttpError.ts b/src/Type/Error/HttpError.ts → src/Model/Error/HttpError.ts
diff --git a/...pe/Error/HttpErrorWithInvalidArguments.ts → ...el/Error/HttpErrorWithInvalidArguments.ts b/...pe/Error/HttpErrorWithInvalidArguments.ts → ...el/Error/HttpErrorWithInvalidArguments.ts
diff --git a/src/Type/Error/InternalServerError.ts → src/Model/Error/InternalServerError.ts b/src/Type/Error/InternalServerError.ts → src/Model/Error/InternalServerError.ts
diff --git a/src/Type/Error/InvalidParameter.ts → src/Model/Error/InvalidParameter.ts b/src/Type/Error/InvalidParameter.ts → src/Model/Error/InvalidParameter.ts
diff --git a/src/Type/Error/NetworkError.ts → src/Model/Error/NetworkError.ts b/src/Type/Error/NetworkError.ts → src/Model/Error/NetworkError.ts
diff --git a/src/Type/Error/NotFound.ts → src/Model/Error/NotFound.ts b/src/Type/Error/NotFound.ts → src/Model/Error/NotFound.ts
diff --git a/src/Type/Error/UnprocessableEntity.ts → src/Model/Error/UnprocessableEntity.ts b/src/Type/Error/UnprocessableEntity.ts → src/Model/Error/UnprocessableEntity.ts
diff --git a/src/Type/Pet/Embedded.ts → src/Model/Pet/Embedded.ts b/src/Type/Pet/Embedded.ts → src/Model/Pet/Embedded.ts
diff --git a/src/Type/Pet/Link.ts → src/Model/Pet/Link.ts b/src/Type/Pet/Link.ts → src/Model/Pet/Link.ts
diff --git a/src/Type/Pet/Links.ts → src/Model/Pet/Links.ts b/src/Type/Pet/Links.ts → src/Model/Pet/Links.ts
diff --git a/src/Type/Pet/PetFilters.ts → src/Model/Pet/PetFilters.ts b/src/Type/Pet/PetFilters.ts → src/Model/Pet/PetFilters.ts
diff --git a/src/Type/Pet/PetList.ts → src/Model/Pet/PetList.ts b/src/Type/Pet/PetList.ts → src/Model/Pet/PetList.ts
diff --git a/src/Type/Pet/PetRequest.ts → src/Model/Pet/PetRequest.ts b/src/Type/Pet/PetRequest.ts → src/Model/Pet/PetRequest.ts
diff --git a/src/Type/Pet/PetResponse.ts → src/Model/Pet/PetResponse.ts b/src/Type/Pet/PetResponse.ts → src/Model/Pet/PetResponse.ts
diff --git a/src/Type/Pet/Vaccination.ts → src/Model/Pet/Vaccination.ts b/src/Type/Pet/Vaccination.ts → src/Model/Pet/Vaccination.ts
diff --git a/src/Type/Form/PetFormProps.ts b/src/Type/Form/PetFormProps.ts
diff --git a/src/__tests__/ApiClient/Pet.test.ts b/src/__tests__/ApiClient/Pet.test.ts
@@ -1,11 +1,11 @@
 import { ListPets, CreatePet, ReadPet, UpdatePet, DeletePet } from '../../ApiClient/Pet';
-import BadRequest from '../../Type/Error/BadRequest';
+import BadRequest from '../../Model/Error/BadRequest';
 import fetchMock from 'fetch-mock';
-import InternalServerError from '../../Type/Error/InternalServerError';
-import NotFound from '../../Type/Error/NotFound';
-import UnprocessableEntity from '../../Type/Error/UnprocessableEntity';
-import NetworkError from '../../Type/Error/NetworkError';
-import PetRequest from '../../Type/Pet/PetRequest';
+import InternalServerError from '../../Model/Error/InternalServerError';
+import NotFound from '../../Model/Error/NotFound';
+import UnprocessableEntity from '../../Model/Error/UnprocessableEntity';
+import NetworkError from '../../Model/Error/NetworkError';
+import PetRequest from '../../Model/Pet/PetRequest';
 
 beforeEach(() => {
     fetchMock.restore();

diff --git a/src/__tests__/Component/Form/PetFilterForm.test.tsx b/src/__tests__/Component/Form/PetFilterForm.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { fireEvent, render } from '@testing-library/react';
-import BadRequest from '../../../Type/Error/BadRequest';
-import InvalidParameter from '../../../Type/Error/InvalidParameter';
+import BadRequest from '../../../Model/Error/BadRequest';
+import InvalidParameter from '../../../Model/Error/InvalidParameter';
 import PetFilterForm from '../../../Component/Form/PetFilterForm';
 
 test('without error', () => {

diff --git a/src/__tests__/Component/Form/PetForm.test.tsx b/src/__tests__/Component/Form/PetForm.test.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import { fireEvent, render } from '@testing-library/react';
-import InvalidParameter from '../../../Type/Error/InvalidParameter';
+import InvalidParameter from '../../../Model/Error/InvalidParameter';
 import PetForm from '../../../Component/Form/PetForm';
-import PetRequest from '../../../Type/Pet/PetResponse';
-import PetResponse from '../../../Type/Pet/PetResponse';
-import UnprocessableEntity from '../../../Type/Error/UnprocessableEntity';
+import PetRequest from '../../../Model/Pet/PetResponse';
+import PetResponse from '../../../Model/Pet/PetResponse';
+import UnprocessableEntity from '../../../Model/Error/UnprocessableEntity';
 
 test('without error', () => {
     const submitPet: { (pet: PetRequest): any; } = (pet: PetRequest) => { };

diff --git a/src/__tests__/Component/Form/TextField.test.tsx b/src/__tests__/Component/Form/TextField.test.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import TextField from '../../../Component/Form/TextField';
-import InvalidParameter from '../../../Type/Error/InvalidParameter';
+import InvalidParameter from '../../../Model/Error/InvalidParameter';
 
 test('default', () => {
     const register = () => {};

diff --git a/src/__tests__/Component/Page/Pet/Create.test.tsx b/src/__tests__/Component/Page/Pet/Create.test.tsx
@@ -4,10 +4,10 @@ import { fireEvent, render } from '@testing-library/react';
 import { Router } from 'react-router-dom';
 import * as ApiClientPet from '../../../../ApiClient/Pet';
 import Create from '../../../../Component/Page/Pet/Create';
-import HttpError from '../../../../Type/Error/HttpError';
-import PetFormProps from '../../../../Type/Form/PetFormProps';
-import PetResponse from '../../../../Type/Pet/PetResponse';
-import UnprocessableEntity from '../../../../Type/Error/UnprocessableEntity';
+import HttpError from '../../../../Model/Error/HttpError';
+import PetFormProps from '../../../../Component/Form/PetFormProps';
+import PetResponse from '../../../../Model/Pet/PetResponse';
+import UnprocessableEntity from '../../../../Model/Error/UnprocessableEntity';
 
 jest.mock('../../../../ApiClient/Pet');
 

diff --git a/src/__tests__/Component/Page/Pet/List.test.tsx b/src/__tests__/Component/Page/Pet/List.test.tsx
@@ -3,12 +3,12 @@ import { createMemoryHistory } from 'history';
 import { render, fireEvent } from '@testing-library/react';
 import { Router } from 'react-router-dom';
 import * as ApiClientPet from '../../../../ApiClient/Pet';
-import BadRequest from '../../../../Type/Error/BadRequest';
-import HttpError from '../../../../Type/Error/HttpError';
+import BadRequest from '../../../../Model/Error/BadRequest';
+import HttpError from '../../../../Model/Error/HttpError';
 import List from '../../../../Component/Page/Pet/List';
-import NotFound from '../../../../Type/Error/NotFound';
-import PetFilterFormProps from '../../../../Type/Form/PetFilterFormProps';
-import PetList from '../../../../Type/Pet/PetList';
+import NotFound from '../../../../Model/Error/NotFound';
+import PetFilterFormProps from '../../../../Component/Form/PetFilterFormProps';
+import PetList from '../../../../Model/Pet/PetList';
 
 jest.mock('../../../../ApiClient/Pet');
 

diff --git a/src/__tests__/Component/Page/Pet/Read.test.tsx b/src/__tests__/Component/Page/Pet/Read.test.tsx
@@ -3,9 +3,9 @@ import { createMemoryHistory } from 'history';
 import { render } from '@testing-library/react';
 import { Router } from 'react-router-dom';
 import * as ApiClientPet from '../../../../ApiClient/Pet';
-import HttpError from '../../../../Type/Error/HttpError';
-import NotFound from '../../../../Type/Error/NotFound';
-import PetResponse from '../../../../Type/Pet/PetResponse';
+import HttpError from '../../../../Model/Error/HttpError';
+import NotFound from '../../../../Model/Error/NotFound';
+import PetResponse from '../../../../Model/Pet/PetResponse';
 import Read from '../../../../Component/Page/Pet/Read';
 
 jest.mock('../../../../ApiClient/Pet');

diff --git a/src/__tests__/Component/Page/Pet/Update.test.tsx b/src/__tests__/Component/Page/Pet/Update.test.tsx
@@ -3,11 +3,11 @@ import { createMemoryHistory } from 'history';
 import { render, fireEvent } from '@testing-library/react';
 import { Router } from 'react-router-dom';
 import * as ApiClientPet from '../../../../ApiClient/Pet';
-import HttpError from '../../../../Type/Error/HttpError';
-import NotFound from '../../../../Type/Error/NotFound';
-import PetFormProps from '../../../../Type/Form/PetFormProps';
-import PetResponse from '../../../../Type/Pet/PetResponse';
-import UnprocessableEntity from '../../../../Type/Error/UnprocessableEntity';
+import HttpError from '../../../../Model/Error/HttpError';
+import NotFound from '../../../../Model/Error/NotFound';
+import PetFormProps from '../../../../Component/Form/PetFormProps';
+import PetResponse from '../../../../Model/Pet/PetResponse';
+import UnprocessableEntity from '../../../../Model/Error/UnprocessableEntity';
 import Update from '../../../../Component/Page/Pet/Update';
 
 jest.mock('../../../../ApiClient/Pet');

diff --git a/src/__tests__/Component/Partial/HttpError.test.tsx b/src/__tests__/Component/Partial/HttpError.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { render } from '@testing-library/react';
-import HttpErrorWithInvalidArguments from '../../../Type/Error/HttpErrorWithInvalidArguments';
+import HttpErrorWithInvalidArguments from '../../../Model/Error/HttpErrorWithInvalidArguments';
 import HttpError from '../../../Component/Partial/HttpError';
 
 test('minimal', () => {

diff --git a/src/__tests__/Denormalizer/InvalidParameterByNameDenormalizer.test.ts b/src/__tests__/Denormalizer/InvalidParameterByNameDenormalizer.test.ts
@@ -1,5 +1,5 @@
 import InvalidParameterByNameDenormalizer from '../../Denormalizer/InvalidParameterByNameDenormalizer';
-import InvalidParameter from '../../Type/Error/InvalidParameter';
+import InvalidParameter from '../../Model/Error/InvalidParameter';
 
 test('default', () => {
     const invalidParameters: Array<InvalidParameter> = [