diff --git a/.gitignore b/.gitignore index 7025d5c..4915027 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ node_modules/ dist/ coverage/ yarn-error.log -.DS_Store \ No newline at end of file diff --git a/src/constants/ErrorCode.ts b/src/constants/ErrorCode.ts deleted file mode 100644 index bbf3fef..0000000 --- a/src/constants/ErrorCode.ts +++ /dev/null @@ -1,6 +0,0 @@ -export enum ErrorCode { - Unknown, - FailedToFetchReddit, - UnableToParseJSON, - NoImageResultsFound, -} \ No newline at end of file diff --git a/src/constants/ErrorMessages.ts b/src/constants/ErrorMessages.ts deleted file mode 100644 index 4c5e24a..0000000 --- a/src/constants/ErrorMessages.ts +++ /dev/null @@ -1,5 +0,0 @@ -export default class ErrorMessages { - public static readonly FailedToFetchReddit = "Failed to fetch result from Reddit"; - public static readonly UnableToParseJSON = "Unable to parse the JSON result"; - public static readonly NoImageResultsFound = "No image results found in response from Reddit"; -} \ No newline at end of file diff --git a/src/contracts/IError.ts b/src/contracts/IError.ts deleted file mode 100644 index 5565b93..0000000 --- a/src/contracts/IError.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { ErrorCode } from "../constants/ErrorCode"; - -export default interface IError { - Code: ErrorCode; - Message: string; -} \ No newline at end of file diff --git a/src/contracts/IReturnResult.ts b/src/contracts/IReturnResult.ts index 780069d..8045c8e 100644 --- a/src/contracts/IReturnResult.ts +++ b/src/contracts/IReturnResult.ts @@ -1,8 +1,6 @@ -import IError from "./IError.js"; import IRedditResult from "./IRedditResult.js"; export default interface IReturnResult { IsSuccess: boolean; Result?: IRedditResult; - Error?: IError; } \ No newline at end of file diff --git a/src/index.ts b/src/index.ts index 4ff8e67..400567e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,10 +1,8 @@ -import IReturnResult from "./contracts/IReturnResult"; -import IRedditResult from "./contracts/IRedditResult"; +import IReturnResult from "./contracts/IReturnResult.js"; +import IRedditResult from "./contracts/IRedditResult.js"; import fetch from "got-cjs"; import { List } from 'linqts'; -import IFetchResult from "./contracts/IFetchResult"; -import { ErrorCode } from "./constants/ErrorCode"; -import ErrorMessages from "./constants/ErrorMessages"; +import IFetchResult from "./contracts/IFetchResult.js"; const sortable = [ 'new', @@ -19,11 +17,7 @@ export default async function randomBunny(subreddit: string, sortBy?: string): P if (!result) { return { - IsSuccess: false, - Error: { - Code: ErrorCode.FailedToFetchReddit, - Message: ErrorMessages.FailedToFetchReddit, - }, + IsSuccess: false } } @@ -31,11 +25,7 @@ export default async function randomBunny(subreddit: string, sortBy?: string): P if (!json) { return { - IsSuccess: false, - Error: { - Code: ErrorCode.UnableToParseJSON, - Message: ErrorMessages.UnableToParseJSON, - }, + IsSuccess: false } } @@ -50,10 +40,6 @@ export default async function randomBunny(subreddit: string, sortBy?: string): P if (dataWithImages.length == 0) { return { IsSuccess: false, - Error: { - Code: ErrorCode.NoImageResultsFound, - Message: ErrorMessages.NoImageResultsFound, - }, }; } else { random = Math.floor((Math.random() * (dataWithImages.length - 1)) + 0); // Between 0 and (size - 1) diff --git a/tests/index.test.ts b/tests/index.test.ts index 107e7ff..6eafc35 100644 --- a/tests/index.test.ts +++ b/tests/index.test.ts @@ -1,5 +1,3 @@ -import { ErrorCode } from "../src/constants/ErrorCode"; -import ErrorMessages from "../src/constants/ErrorMessages"; import randomBunny from "../src/index"; import fetch from "got-cjs"; @@ -34,7 +32,6 @@ describe('randomBunny', () => { expect(result.IsSuccess).toBeTruthy(); expect(result.Result).toBeDefined(); - expect(result.Error).toBeUndefined(); expect(fetchMock).toBeCalledWith('https://reddit.com/r/rabbits/new.json'); }); @@ -66,7 +63,6 @@ describe('randomBunny', () => { expect(result.IsSuccess).toBeTruthy(); expect(result.Result).toBeDefined(); - expect(result.Error).toBeUndefined(); expect(fetchMock).toBeCalledWith('https://reddit.com/r/rabbits/hot.json'); }); @@ -98,7 +94,6 @@ describe('randomBunny', () => { expect(result.IsSuccess).toBeTruthy(); expect(result.Result).toBeDefined(); - expect(result.Error).toBeUndefined(); expect(fetchMock).toBeCalledWith('https://reddit.com/r/rabbits/hot.json'); }); @@ -110,10 +105,6 @@ describe('randomBunny', () => { expect(result.IsSuccess).toBeFalsy(); expect(result.Result).toBeUndefined(); - expect(result.Error).toBeDefined(); - - expect(result.Error!.Code).toBe(ErrorCode.FailedToFetchReddit); - expect(result.Error!.Message).toBe(ErrorMessages.FailedToFetchReddit); expect(fetchMock).toBeCalledWith('https://reddit.com/r/rabbits/new.json'); }); @@ -127,10 +118,6 @@ describe('randomBunny', () => { expect(result.IsSuccess).toBeFalsy(); expect(result.Result).toBeUndefined(); - expect(result.Error).toBeDefined(); - - expect(result.Error!.Code).toBe(ErrorCode.UnableToParseJSON); - expect(result.Error!.Message).toBe(ErrorMessages.UnableToParseJSON); expect(fetchMock).toBeCalledWith('https://reddit.com/r/rabbits/new.json'); }); @@ -148,10 +135,6 @@ describe('randomBunny', () => { expect(result.IsSuccess).toBeFalsy(); expect(result.Result).toBeUndefined(); - expect(result.Error).toBeDefined(); - - expect(result.Error!.Code).toBe(ErrorCode.NoImageResultsFound); - expect(result.Error!.Message).toBe(ErrorMessages.NoImageResultsFound); expect(fetchMock).toBeCalledWith('https://reddit.com/r/rabbits/new.json'); }); @@ -183,10 +166,6 @@ describe('randomBunny', () => { expect(result.IsSuccess).toBeFalsy(); expect(result.Result).toBeUndefined(); - expect(result.Error).toBeDefined(); - - expect(result.Error!.Code).toBe(ErrorCode.NoImageResultsFound); - expect(result.Error!.Message).toBe(ErrorMessages.NoImageResultsFound); expect(fetchMock).toBeCalledWith('https://reddit.com/r/rabbits/new.json'); });