refactors openWeatherMaps service to follow export convention of other sevices

Author: Aiiion

src/controllers/weather.controller.mjs

@@ -1,15 +1,10 @@
-import {
-  currentPollution,
-  currentWeather,
-  forecastPollution,
-  forecastWeather,
-} from "../services/openWeatherMaps.service.mjs";
+import openWeatherMapsService from "../services/openWeatherMaps.service.mjs";
 import { getCoordinateBound } from "../utils/geoHelpers.mjs";
 import { translateEpochDay } from "../utils/dateTimeHelpers.mjs";
 
 export const aggregate = async (req, res) => {
-  const weatherReq = await currentWeather(req.query);
-  const pollutionReq = await currentPollution(req.query);
+  const weatherReq = await openWeatherMapsService.currentWeather(req.query);
+  const pollutionReq = await openWeatherMapsService.currentPollution(req.query);
 
   let warnings = null;
   const bound = getCoordinateBound(req.query.lat, req.query.lon);
@@ -22,7 +17,7 @@ export const aggregate = async (req, res) => {
     }
   }
 
-  const forecastReq = await forecastWeather(req.query).then((res) => {
+  const forecastReq = await openWeatherMapsService.forecastWeather(req.query).then((res) => {
     const forecastData = res.data;
     const upcoming = {};
 
@@ -47,8 +42,8 @@ export const aggregate = async (req, res) => {
 };
 
 export const weather = async (req, res) => {
-  const weatherReq = await currentWeather(req.query);
-  const forecastReq = await forecastWeather(req.query);
+  const weatherReq = await openWeatherMapsService.currentWeather(req.query);
+  const forecastReq = await openWeatherMapsService.forecastWeather(req.query);
 
   return res.status(200).send({
     data: {
@@ -59,8 +54,8 @@ export const weather = async (req, res) => {
 };
 
 export const pollution = async (req, res) => {
-  const pollutionReq = await currentPollution(req.query);
-  const forecastReq = await forecastPollution(req.query);
+  const pollutionReq = await openWeatherMapsService.currentPollution(req.query);
+  const forecastReq = await openWeatherMapsService.forecastPollution(req.query);
 
   return res.status(200).send({
     data: {

src/services/openWeatherMaps.service.mjs

@@ -1,42 +1,46 @@
 import axios from "axios";
 import { OWM_API_URL } from "../utils/constants.mjs";
 
-export const currentWeather = async (query) => 
-    axios({
-        method: 'get',
-        url: OWM_API_URL + '/weather',
-        params: {
-            ...query,
-            appid: process.env.OWM_API_KEY
-        }
-    });
+const openWeatherMapsService = {
+    currentWeather: async (query) =>
+        axios({
+            method: 'get',
+            url: OWM_API_URL + '/weather',
+            params: {
+                ...query,
+                appid: process.env.OWM_API_KEY,
+            },
+        }),
 
-export const forecastWeather = async (query) =>
-    axios({
-        method: 'get',
-        url: OWM_API_URL + '/forecast',
-        params: {
-            ...query,
-            appid: process.env.OWM_API_KEY
-        }
-    });
+    forecastWeather: async (query) =>
+        axios({
+            method: 'get',
+            url: OWM_API_URL + '/forecast',
+            params: {
+                ...query,
+                appid: process.env.OWM_API_KEY,
+            },
+        }),
 
-export const currentPollution = async (query) =>
-    axios({
-        method: 'get',
-        url: OWM_API_URL + '/air_pollution',
-        params: {
-            ...query,
-            appid: process.env.OWM_API_KEY
-        }
-    });
+    currentPollution: async (query) =>
+        axios({
+            method: 'get',
+            url: OWM_API_URL + '/air_pollution',
+            params: {
+                ...query,
+                appid: process.env.OWM_API_KEY,
+            },
+        }),
 
-export const forecastPollution = async (query) =>
-    axios({
-        method: 'get',
-        url: OWM_API_URL + '/air_pollution/forecast',
-        params: {
-            ...query,
-            appid: process.env.OWM_API_KEY
-        }
-    });
+    forecastPollution: async (query) =>
+        axios({
+            method: 'get',
+            url: OWM_API_URL + '/air_pollution/forecast',
+            params: {
+                ...query,
+                appid: process.env.OWM_API_KEY,
+            },
+        }),
+};
+
+export default openWeatherMapsService;

src/tests/api.test.mjs

@@ -7,10 +7,12 @@ import {
 } from "../fixtures/openWeatherMaps.fixture.mjs";
 
 jest.unstable_mockModule("../services/openWeatherMaps.service.mjs", () => ({
-  currentWeather: jest.fn().mockResolvedValue(weather),
-  forecastWeather: jest.fn().mockResolvedValue(weatherForecast),
-  currentPollution: jest.fn().mockResolvedValue(airPollution),
-  forecastPollution: jest.fn().mockResolvedValue(airPollutionForecast),
+  default: {
+    currentWeather: jest.fn().mockResolvedValue(weather),
+    forecastWeather: jest.fn().mockResolvedValue(weatherForecast),
+    currentPollution: jest.fn().mockResolvedValue(airPollution),
+    forecastPollution: jest.fn().mockResolvedValue(airPollutionForecast),
+  },
 }));
 
 import request from "supertest";