refactoring

Author: pashidlos

src/pages/ProjectPage.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
 import { Grid, Dialog, IconButton, Box, Typography } from "@material-ui/core";
 import { useParams, useLocation, useHistory } from "react-router-dom";
 import { Build, TestRun } from "../types";
-import { projectsService, buildsService, testRunService } from "../services";
+import { buildsService, testRunService } from "../services";
 import BuildList from "../components/BuildList";
 import ProjectSelect from "../components/ProjectSelect";
 import qs from "qs";
@@ -79,14 +79,14 @@ const ProjectPage = () => {
 
   useEffect(() => {
     if (projectId) {
-      projectsService.getBuilds(projectId).then((builds) => setBuilds(builds));
+      buildsService.getList(projectId).then((builds) => setBuilds(builds));
     }
   }, [projectId]);
 
   useEffect(() => {
     if (selectedBuildId) {
-      buildsService.get(selectedBuildId).then((build) => {
-        setTestRuns(build.testRuns);
+      testRunService.getList(selectedBuildId).then((testRuns) => {
+        setTestRuns(testRuns);
       });
     }
   }, [selectedBuildId]);

src/services/builds.service.ts

@@ -2,18 +2,22 @@ import { Build } from "../types";
 import { handleResponse, authHeader } from "../_helpers/service.helpers";
 import { API_URL } from "../_config/api.config";
 
+const ENDPOINT_URL = "/builds"
+
 export const buildsService = {
-  get,
+  getList,
   remove,
 };
 
-function get(id: string): Promise<Build> {
+function getList(projectId: string): Promise<Build[]> {
   const requestOptions = {
     method: "GET",
     headers: authHeader(),
   };
 
-  return fetch(`${API_URL}/builds/${id}`, requestOptions).then(handleResponse);
+  return fetch(`${API_URL}${ENDPOINT_URL}?projectId=${projectId}`, requestOptions).then(
+    handleResponse
+  );
 }
 
 function remove(id: string): Promise<number> {
@@ -22,5 +26,5 @@ function remove(id: string): Promise<number> {
     headers: authHeader(),
   };
 
-  return fetch(`${API_URL}/builds/${id}`, requestOptions).then(handleResponse);
+  return fetch(`${API_URL}${ENDPOINT_URL}/${id}`, requestOptions).then(handleResponse);
 }

src/services/projects.service.ts

@@ -1,9 +1,8 @@
-import { Project, Build } from "../types";
+import { Project } from "../types";
 import { handleResponse, authHeader } from "../_helpers/service.helpers";
 import { API_URL } from "../_config/api.config";
 
 export const projectsService = {
-  getBuilds,
   getAll,
   remove,
   create,
@@ -18,17 +17,6 @@ function getAll(): Promise<Project[]> {
   return fetch(`${API_URL}/projects`, requestOptions).then(handleResponse);
 }
 
-function getBuilds(id: string): Promise<Build[]> {
-  const requestOptions = {
-    method: "GET",
-    headers: authHeader(),
-  };
-
-  return fetch(`${API_URL}/projects/${id}`, requestOptions).then(
-    handleResponse
-  );
-}
-
 function remove(id: string): Promise<number> {
   const requestOptions = {
     method: "DELETE",

src/services/testRun.service.ts

@@ -6,22 +6,20 @@ import { IgnoreArea } from "../types/ignoreArea";
 const ENDPOINT_URL = "/test-runs"
 
 export const testRunService = {
-  get,
+  getList,
   remove,
   approve,
   reject,
   setIgnoreAreas,
 };
 
-function get(testId: string): Promise<TestRun> {
+function getList(buildId: string): Promise<TestRun[]> {
   const requestOptions = {
     method: "GET",
     headers: authHeader(),
   };
 
-  return fetch(`${API_URL}${ENDPOINT_URL}/${testId}`, requestOptions).then(
-    handleResponse
-  );
+  return fetch(`${API_URL}${ENDPOINT_URL}?buildId=${buildId}`, requestOptions).then(handleResponse);
 }
 
 function remove(id: string): Promise<Number> {

src/services/testVariation.service.ts

@@ -3,6 +3,8 @@ import { handleResponse, authHeader } from "../_helpers/service.helpers";
 import { API_URL } from "../_config/api.config";
 import { IgnoreArea } from "../types/ignoreArea";
 
+const ENDPOINT_URL = "/test-variations"
+
 export const testVariationService = {
   get,
   setIgnoreAreas
@@ -14,7 +16,7 @@ function get(projectId: String): Promise<TestVariation[]> {
     headers: authHeader(),
   };
 
-  return fetch(`${API_URL}/test-variations?projectId=${projectId}`, requestOptions).then(handleResponse);
+  return fetch(`${API_URL}${ENDPOINT_URL}?projectId=${projectId}`, requestOptions).then(handleResponse);
 }
 
 function setIgnoreAreas(
@@ -28,7 +30,7 @@ function setIgnoreAreas(
   };
 
   return fetch(
-    `${API_URL}/test-variations/ignoreArea/${variationId}`,
+    `${API_URL}${ENDPOINT_URL}/ignoreArea/${variationId}`,
     requestOptions
   ).then(handleResponse);
 }

src/services/users.service.ts

@@ -2,6 +2,8 @@ import { handleResponse, authHeader } from "../_helpers/service.helpers";
 import { User } from "../types/user";
 import { API_URL } from "../_config/api.config";
 
+const ENDPOINT_URL = "/users"
+
 export const usersService = {
   login,
   logout,
@@ -17,7 +19,7 @@ function login(email: string, password: string): Promise<User> {
     body: JSON.stringify({ email, password }),
   };
 
-  return fetch(`${API_URL}/users/login`, requestOptions)
+  return fetch(`${API_URL}${ENDPOINT_URL}/login`, requestOptions)
     .then(handleResponse)
     .then((user) => {
       setUserInLocalStorage(user)
@@ -32,7 +34,7 @@ function register(firstName: string, lastName: string, email: string, password:
     body: JSON.stringify({ firstName, lastName, email, password }),
   };
 
-  return fetch(`${API_URL}/users/register`, requestOptions)
+  return fetch(`${API_URL}${ENDPOINT_URL}/register`, requestOptions)
     .then(handleResponse)
     .then((user) => {
       setUserInLocalStorage(user)
@@ -47,7 +49,7 @@ function update({ id, firstName, lastName, email }: { id: string, firstName: str
     body: JSON.stringify({ firstName, lastName, email }),
   };
 
-  return fetch(`${API_URL}/users/${id}`, requestOptions)
+  return fetch(`${API_URL}${ENDPOINT_URL}/${id}`, requestOptions)
     .then(handleResponse)
     .then((user) => {
       setUserInLocalStorage(user)
@@ -62,7 +64,7 @@ function changePassword(password: string): Promise<boolean> {
     body: JSON.stringify({ password }),
   };
 
-  return fetch(`${API_URL}/users/password`, requestOptions)
+  return fetch(`${API_URL}${ENDPOINT_URL}/password`, requestOptions)
     .then(handleResponse)
 }