refactor: replace types with task based versions

AlexKMarshall · Sep 30, 2022 · 8d04366 · 8d04366
1 parent 2de0e14
commit 8d04366
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 23 deletions.
diff --git a/apps/domain/src/faction/create/createFaction.ts b/apps/domain/src/faction/create/createFaction.ts
@@ -1,9 +1,9 @@
 import { pipe } from 'fp-ts/lib/function'
 import { createEvents, validateFaction } from './implementation'
 import * as TE from 'fp-ts/TaskEither'
-import { CreateFactionT } from './types'
+import { CreateFaction } from './types'
 
-export const createFaction: CreateFactionT =
+export const createFaction: CreateFaction =
   ({ checkFactionNameExists }) =>
   (unvalidatedFaction) => {
     return pipe(

diff --git a/apps/domain/src/faction/create/implementation.ts b/apps/domain/src/faction/create/implementation.ts
@@ -10,7 +10,6 @@ import {
   ValidatedFaction,
   CreateFactionEvent,
   CheckFactionNameExists,
-  CheckFactionNameExistsT,
 } from './types'
 import * as TE from 'fp-ts/TaskEither'
 import * as T from 'fp-ts/Task'
@@ -23,12 +22,6 @@ type ValidateFaction = (
   checkFactionNameExists: CheckFactionNameExists
 ) => (
   unvalidatedFaction: UnvalidatedFaction
-) => E.Either<FactionValidationError, ValidatedFaction>
-
-type ValidateFactionT = (
-  checkFactionNameExists: CheckFactionNameExistsT
-) => (
-  unvalidatedFaction: UnvalidatedFaction
 ) => TE.TaskEither<FactionValidationError, ValidatedFaction>
 
 class FactionNameAlreadyExistsError extends Error {
@@ -49,7 +42,7 @@ const _tag = (name: FactionName.FactionName): UniqueFactionName =>
 export type UniqueFactionName = Opaque<string, 'UniqueFactionName'>
 
 const toUniqueFactionName =
-  (checkFactionNameExists: CheckFactionNameExistsT) =>
+  (checkFactionNameExists: CheckFactionNameExists) =>
   (
     name: FactionName.FactionName
   ): TE.TaskEither<FactionNameAlreadyExistsError, UniqueFactionName> => {
@@ -65,15 +58,15 @@ const toUniqueFactionName =
   }
 
 export const toValidFactionNameT = (
-  checkFactionNameExists: CheckFactionNameExistsT
+  checkFactionNameExists: CheckFactionNameExists
 ) =>
   flow(
     FactionName.parse('name'),
     TE.fromEither,
     TE.chainW(toUniqueFactionName(checkFactionNameExists))
   )
 
-export const validateFaction: ValidateFactionT =
+export const validateFaction: ValidateFaction =
   (checkFactionExists) => (unvalidatedFaction) => {
     return pipe(unvalidatedFaction, ({ name }) =>
       sequenceS(TE.ApplySeq)({

diff --git a/apps/domain/src/faction/create/types.ts b/apps/domain/src/faction/create/types.ts
@@ -8,8 +8,7 @@ import * as TE from 'fp-ts/TaskEither'
  * External dependencies / DB Functions
  */
 
-export type CheckFactionNameExists = (name: string) => boolean
-export type CheckFactionNameExistsT = (name: string) => T.Task<boolean>
+export type CheckFactionNameExists = (name: string) => T.Task<boolean>
 
 /*
  * Public API
@@ -36,18 +35,9 @@ export type CreateFactionError = FactionValidationError
 export type CreateFactionDependencies = {
   checkFactionNameExists: CheckFactionNameExists
 }
-export type CreateFactionDependenciesT = {
-  checkFactionNameExists: CheckFactionNameExistsT
-}
 
 export type CreateFaction = (
   dependencies: CreateFactionDependencies
 ) => (
   unvalidatedFaction: UnvalidatedFaction
-) => E.Either<CreateFactionError, CreateFactionEvent[]>
-
-export type CreateFactionT = (
-  dependencies: CreateFactionDependenciesT
-) => (
-  unvalidatedFaction: UnvalidatedFaction
 ) => TE.TaskEither<CreateFactionError, CreateFactionEvent[]>