chore: Tidy up import, export and names

app/data/gdhiRepo.ts

@@ -1,6 +1,6 @@
 import prisma from "./db";
 
-export const getGDHI2020ByITL3 = async (
+const getGDHI2020ByITL3 = async (
   itl3: string
 ): Promise<number> => {
   try {
@@ -20,3 +20,7 @@ export const getGDHI2020ByITL3 = async (
     throw Error(`Data error: Unable to find gdhi2020 for itl3 ${itl3}`);
   }
 };
+
+export const gdhiRepo = {
+  getGDHI2020ByITL3,
+}

app/data/itlLookupRepo.ts → app/data/itlRepo.ts

@@ -1,6 +1,6 @@
 import prisma from "./db";
 
-export const getItl3ByPostcodeDistrict = async (
+const getItl3ByPostcodeDistrict = async (
   postcodeDistrict: string
 ): Promise<string> => {
   try {
@@ -22,3 +22,7 @@ export const getItl3ByPostcodeDistrict = async (
     throw new Error(`Data error: Unable get get itl3 for postcode district ${postcodeDistrict}`);
   }
 };
+
+export const itlRepo = {
+  getItl3ByPostcodeDistrict,
+}

app/services/calculationService.ts

@@ -1,6 +1,6 @@
 import { PrismaClient } from "@prisma/client";
-import * as itl3Service from "../services/itlLookupService";
-import * as ghdiService from "../services/gdhiService";
+import { itlService } from "./itlService";
+import { gdhiService } from "./gdhiService";
 import { Calculation } from "../schemas/calculationSchema";
 
 const prisma = new PrismaClient();
@@ -112,8 +112,8 @@ export const getHouseholdData = async (
     // TODO: Make columns non-nullable
     if (!buildPrice) throw Error("Missing buildPrice");
 
-    const itl3 = await itl3Service.getByPostcodeDistrict(postcodeDistrict);
-    const gdhi = await ghdiService.getByITL3(itl3);
+    const itl3 = await itlService.getByPostcodeDistrict(postcodeDistrict);
+    const gdhi = await gdhiService.getByITL3(itl3);
 
     const {
       _avg: { monthlyMeanRent: averageRentMonthly },

app/services/gdhiService.ts

@@ -1,5 +1,9 @@
-import * as repo from './../data/gdhiRepo';
+import { gdhiRepo } from "../data/gdhiRepo";
 
-export const getByITL3 = async (itl3: string) => {
-  return await repo.getGDHI2020ByITL3(itl3);
+const getByITL3 = async (itl3: string) => {
+  return await gdhiRepo.getGDHI2020ByITL3(itl3);
+};
+
+export const gdhiService = {
+  getByITL3,
 };

app/services/itlService.ts

@@ -0,0 +1,9 @@
+import { itlRepo } from "../data/itlRepo";
+
+const getByPostcodeDistrict = async (postcodeDistrict: string) => {
+  return await itlRepo.getItl3ByPostcodeDistrict(postcodeDistrict);
+}
+
+export const itlService = {
+  getByPostcodeDistrict,
+}