chore: refactor store to return the added object when addition occurs

OpenPathfinder · Dec 30, 2024 · 5e988fa · 5e988fa
1 parent 33cc8c0
commit 5e988fa
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/__tests__/checks/githubOrgMFA.test.js b/__tests__/checks/githubOrgMFA.test.js
@@ -39,8 +39,8 @@ beforeAll(async () => {
 })
 
 beforeEach(async () => {
-  await resetDatabase(knex);
-  [project] = await addProject({ name: sampleGithubOrg.login, category: 'impact' })
+  await resetDatabase(knex)
+  project = await addProject({ name: sampleGithubOrg.login, category: 'impact' })
 })
 
 afterAll(async () => {

diff --git a/__tests__/checks/softwareDesignTraining.test.js b/__tests__/checks/softwareDesignTraining.test.js
@@ -40,8 +40,8 @@ beforeAll(async () => {
 })
 
 beforeEach(async () => {
-  await resetDatabase(knex);
-  [project] = await addProject({ name: 'project', category: 'impact' })
+  await resetDatabase(knex)
+  project = await addProject({ name: 'project', category: 'impact' })
 })
 
 afterAll(async () => {

diff --git a/__tests__/cli/workflows.test.js b/__tests__/cli/workflows.test.js
@@ -74,7 +74,7 @@ describe('run update-github-orgs', () => {
 
   test('Should update the project with new information available', async () => {
     // Prepare the database
-    const [project] = await addProject({ name: sampleGithubOrg.login, category: 'impact' })
+    const project = await addProject({ name: sampleGithubOrg.login, category: 'impact' })
     await addGithubOrg({ login: sampleGithubOrg.login, html_url: sampleGithubOrg.html_url, project_id: project.id })
     const projects = await getAllProjects()
     expect(projects.length).toBe(1)
@@ -105,7 +105,7 @@ describe('run upsert-github-repositories', () => {
   })
   test('Should add the repositories related to the organization', async () => {
     // Prepare the database
-    const [project] = await addProject({ name: sampleGithubOrg.login, category: 'impact' })
+    const project = await addProject({ name: sampleGithubOrg.login, category: 'impact' })
     await addGithubOrg({ login: sampleGithubOrg.login, html_url: sampleGithubOrg.html_url, project_id: project.id })
     const projects = await getAllProjects()
     expect(projects.length).toBe(1)
@@ -123,8 +123,8 @@ describe('run upsert-github-repositories', () => {
     expect(githubRepos[0].description).toBe(sampleGithubRepository.description)
   })
   test('Should update the repositories related to the organization', async () => {
-    const [project] = await addProject({ name: sampleGithubOrg.login, category: 'impact' })
-    const [org] = await addGithubOrg({ login: sampleGithubOrg.login, html_url: sampleGithubOrg.html_url, project_id: project.id })
+    const project = await addProject({ name: sampleGithubOrg.login, category: 'impact' })
+    const org = await addGithubOrg({ login: sampleGithubOrg.login, html_url: sampleGithubOrg.html_url, project_id: project.id })
     const githubRepoData = simplifyObject(sampleGithubRepository, {
       include: ['node_id', 'name', 'full_name', 'html_url', 'url', 'git_url', 'ssh_url', 'clone_url', 'visibility', 'default_branch']
     })

diff --git a/src/cli/project.js b/src/cli/project.js
@@ -88,7 +88,7 @@ async function runAddProjectCommand (knex, options = {}) {
 
   answers.githubUrls = Array.isArray(answers.githubUrls) ? answers.githubUrls : stringToArray(answers.githubUrls)
 
-  const [project] = await addProject({
+  const project = await addProject({
     name: answers.name.toLowerCase(),
     category: answers.category
   })

diff --git a/src/store/index.js b/src/store/index.js
@@ -7,7 +7,7 @@ const getAllFn = knex => (table) => {
 
 const addFn = knex => (table, record) => {
   debug(`Inserting ${record} in ${table}`)
-  return knex(table).insert(record).returning('*')
+  return knex(table).insert(record).returning('*').then(results => results[0])
 }
 
 const upsertRecord = async ({ knex, table, uniqueCriteria, data }) => {
@@ -34,7 +34,7 @@ const addGithubOrganization = knex => async (organization) => {
     throw new Error(`Organization with login (${organization.login}) already exists`)
   }
   debug(`Inserting organization (${organization.login})...`)
-  return knex('github_organizations').insert(organization).returning('*')
+  return knex('github_organizations').insert(organization).returning('*').then(results => results[0])
 }
 
 const addProject = knex => async (project) => {
@@ -48,7 +48,7 @@ const addProject = knex => async (project) => {
   return knex('projects').insert({
     name,
     category
-  }).returning('*')
+  }).returning('*').then(results => results[0])
 }
 
 const getCheckByCodeName = knex => (codeName) => {