fix(JOB-192) : linter is my friend

octo-webf · Nov 30, 2017 · 21f17a5 · 21f17a5
1 parent 61b9cfe
commit 21f17a5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/server/src/domain/services/job-service.js b/server/src/domain/services/job-service.js
@@ -7,15 +7,14 @@ const mailService = require('./mail-service'); // A service should not be depend
 
 const CACHE_KEY = 'get_jobs';
 
-async function _fetchAndCacheJobs() {
-  const accessToken = await octopodClient.getAccessToken();
-  const projects = await octopodClient.fetchProjectsToBeStaffed(accessToken);
-  const filterProjects = filterProjectByStatusAndKind(projects);
-  const activities = await octopodClient.fetchActivitiesToBeStaffed(accessToken, filterProjects);
-  const jobs = await jobsSerializer.serialize(projects, activities);
-  cache.set(CACHE_KEY, jobs);
+function _isStatusWantedOnJobBoard(project) {
+  return project.status === 'mission_signed'
+    || project.status === 'mission_accepted'
+    || project.status === 'proposal_sent';
+}
 
-  return jobs;
+function _isKindOfProjectWantedOnJobBoard(project) {
+  return project.kind === 'cost_reimbursable' || project.kind === 'fixed_price';
 }
 
 function filterProjectByStatusAndKind(projects) {
@@ -24,14 +23,15 @@ function filterProjectByStatusAndKind(projects) {
     .filter(project => _isKindOfProjectWantedOnJobBoard(project));
 }
 
-function _isStatusWantedOnJobBoard(project) {
-  return project.status === 'mission_signed'
-    || project.status === 'mission_accepted'
-    || project.status === 'proposal_sent';
-}
+async function _fetchAndCacheJobs() {
+  const accessToken = await octopodClient.getAccessToken();
+  const projects = await octopodClient.fetchProjectsToBeStaffed(accessToken);
+  const filterProjects = filterProjectByStatusAndKind(projects);
+  const activities = await octopodClient.fetchActivitiesToBeStaffed(accessToken, filterProjects);
+  const jobs = await jobsSerializer.serialize(projects, activities);
+  cache.set(CACHE_KEY, jobs);
 
-function _isKindOfProjectWantedOnJobBoard(project) {
-  return project.kind === 'cost_reimbursable' || project.kind === 'fixed_price';
+  return jobs;
 }
 
 function _compareFetchedAndCachedJobs(freshJobs, oldJobs) {

diff --git a/server/src/infrastructure/octopod.js b/server/src/infrastructure/octopod.js
@@ -33,7 +33,7 @@ const OctopodClient = {
     if (projects.length === 100 * (page - 1)) {
       const moreProjects = await this.fetchProjectsToBeStaffedPerPage(accessToken, page);
       const allProjects = projects.concat(moreProjects);
-      return await this.fetchProjectsToBeStaffed(accessToken, allProjects, page + 1);
+      return this.fetchProjectsToBeStaffed(accessToken, allProjects, page + 1);
     }
     return projects;
   },

diff --git a/server/test/unit/domain/services/job-service.spec.js b/server/test/unit/domain/services/job-service.spec.js
@@ -111,7 +111,7 @@ describe('Unit | Service | job-service', () => {
         projectFromOctopod('mission_accepted'),
         projectFromOctopod('mission_signed'),
       ];
-      sinon.stub(octopodClient, 'fetchProjectsToBeStaffed').resolves(projectsFromOctopod)
+      sinon.stub(octopodClient, 'fetchProjectsToBeStaffed').resolves(projectsFromOctopod);
 
       // when
       promise.then(() => {
@@ -220,7 +220,7 @@ describe('Unit | Service | job-service', () => {
           isInit: false,
           hasChanges: true,
           removedJobs: expectedRemovedJobs,
-          addedJobs: expectedAddedJobs
+          addedJobs: expectedAddedJobs,
         });
       });
     });

diff --git a/server/test/unit/infrastructure/octopod.spec.js b/server/test/unit/infrastructure/octopod.spec.js
@@ -86,10 +86,10 @@ describe('Unit | Utils | octopod-client', () => {
 
   describe('#fetchProjectsToBeStaffedPerPage', () => {
     beforeEach(() => {
-        sinon.stub(OctopodClient, 'fetchProjectsToBeStaffedPerPage');
+      sinon.stub(OctopodClient, 'fetchProjectsToBeStaffedPerPage');
     });
     afterEach(() => {
-       OctopodClient.fetchProjectsToBeStaffedPerPage.restore();
+      OctopodClient.fetchProjectsToBeStaffedPerPage.restore();
     });
 
     describe('when there are more than 100 projects', () => {
@@ -161,7 +161,7 @@ describe('Unit | Utils | octopod-client', () => {
 
         // then
         return promise.then(() => {
-          const expectedOptions = (page) => ({
+          const expectedOptions = page => ({
             url: `http://octopod.url/api/v0/projects?staffing_needed=true&page=${page}&per_page=100`,
             headers: {
               Authorization: 'Bearer access-token',