feat(updateDoc): dont repeat updateDoc

Author: hulkoba

jobs/github-event/push.js

@@ -3,8 +3,7 @@ const Log = require('gk-log')
 
 const dbs = require('../../lib/dbs')
 const env = require('../../lib/env')
-const { updateRepoDoc } = require('../../lib/repository-docs')
-const updatedAt = require('../../lib/updated-at')
+const { updateRepoDoc, updateDoc } = require('../../lib/repository-docs')
 const diff = require('../../lib/diff-package-json')
 const diffGreenkeeperJson = require('../../lib/diff-greenkeeper-json')
 const deleteBranches = require('../../lib/delete-branches')
@@ -205,19 +204,6 @@ module.exports = async function (data) {
   log.success('success')
 }
 
-function updateDoc (repositories, repository, repoDoc) {
-  return repositories.put(
-    updatedAt(
-      Object.assign(repoDoc, {
-        private: repository.private,
-        fullName: repository.full_name,
-        fork: repository.fork,
-        hasIssues: repository.has_issues
-      })
-    )
-  )
-}
-
 function hasRelevantChanges (commits, files) {
   return _.some(files, file => {
     return _.some(['added', 'removed', 'modified'], changeType => {

jobs/github-event/repository/archived.js

@@ -14,7 +14,7 @@ const Log = require('gk-log')
 const env = require('../../../lib/env')
 const dbs = require('../../../lib/dbs')
 const { maybeUpdatePaymentsJob } = require('../../../lib/payments')
-const updatedAt = require('../../../lib/updated-at')
+const { updateDoc } = require('../../../lib/repository-docs')
 
 module.exports = async function ({ repository }) {
   const { repositories } = await dbs()
@@ -30,17 +30,4 @@ module.exports = async function ({ repository }) {
   if (!env.IS_ENTERPRISE) {
     return maybeUpdatePaymentsJob({ accountId: repoDoc.accountId, isPrivate: repoDoc.private })
   }
-
-  function updateDoc (repositories, repository, repoDoc) {
-    return repositories.put(
-      updatedAt(
-        Object.assign(repoDoc, {
-          private: repository.private,
-          fullName: repository.full_name,
-          fork: repository.fork,
-          hasIssues: repository.has_issues
-        })
-      )
-    )
-  }
 }

jobs/github-event/repository/privatized.js

@@ -8,7 +8,7 @@ const Log = require('gk-log')
 const env = require('../../../lib/env')
 const dbs = require('../../../lib/dbs')
 const { maybeUpdatePaymentsJob } = require('../../../lib/payments')
-const updatedAt = require('../../../lib/updated-at')
+const { updateDoc } = require('../../../lib/repository-docs')
 
 module.exports = async function ({ repository }) {
   const { repositories } = await dbs()
@@ -26,17 +26,4 @@ module.exports = async function ({ repository }) {
     log.warn('payment required')
     return maybeUpdatePaymentsJob({ accountId: repoDoc.accountId, isPrivate: repoDoc.private, repositoryId })
   }
-
-  function updateDoc (repositories, repository, repoDoc) {
-    return repositories.put(
-      updatedAt(
-        Object.assign(repoDoc, {
-          private: repository.private,
-          fullName: repository.full_name,
-          fork: repository.fork,
-          hasIssues: repository.has_issues
-        })
-      )
-    )
-  }
 }

lib/repository-docs.js

@@ -12,7 +12,8 @@ const { validate } = require('./validate-greenkeeper-json')
 
 module.exports = {
   createDocs,
-  updateRepoDoc
+  updateRepoDoc,
+  updateDoc
 }
 
 // trigger (several) initial-subgroup-pr(s):
@@ -101,3 +102,16 @@ function createDocs ({ repositories, accountId }) {
     packages: {}
   }))
 }
+
+function updateDoc (repositories, repository, repoDoc) {
+  return repositories.put(
+    updatedAt(
+      Object.assign(repoDoc, {
+        private: repository.private,
+        fullName: repository.full_name,
+        fork: repository.fork,
+        hasIssues: repository.has_issues
+      })
+    )
+  )
+}

test/jobs/payment-required.js

@@ -0,0 +1,74 @@
+const nock = require('nock')
+
+const dbs = require('../../lib/dbs')
+const removeIfExists = require('../helpers/remove-if-exists')
+
+describe('payment-required', async () => {
+  beforeAll(async () => {
+    const { repositories, installations } = await dbs()
+
+    await installations.put({
+      _id: '111',
+      installation: 11,
+      plan: 'free'
+    })
+
+    await repositories.put({
+      _id: '1_payment-required',
+      accountId: '111',
+      fullName: 'jacoba/private',
+      enabled: true,
+      private: true
+    })
+  })
+
+  beforeEach(() => {
+    jest.resetModules()
+    jest.clearAllMocks()
+  })
+
+  afterAll(async () => {
+    const { repositories, installations } = await dbs()
+    await Promise.all([
+      removeIfExists(repositories, 'payment-required'),
+      removeIfExists(installations, '111')
+    ])
+  })
+
+  test('create payment-required issue', async () => {
+    expect.assertions(9)
+    const githubMock = nock('https://api.github.com')
+      .post('/app/installations/11/access_tokens')
+      .optionally()
+      .reply(200, {
+        token: 'secret'
+      })
+      .get('/rate_limit')
+      .optionally()
+      .reply(200)
+      .post('/repos/jacoba/private/issues', ({ title, body, labels }) => {
+        expect(title).toEqual('Payment required')
+        expect(body).toMatch(/🚨 You privatized your repo. 🚨/)
+        expect(body).toMatch(/Please enter your payment information at/)
+        expect(labels[0]).toEqual('greenkeeper')
+        return true
+      })
+      .reply(201, () => {
+        return {
+          number: 10
+        }
+      })
+
+    const paymentRequired = require('../../jobs/payment-required')
+    const newJob = await paymentRequired({ accountId: '111', repositoryId: '1_payment-required' })
+    expect(newJob).toBeFalsy()
+
+    const { repositories } = await dbs()
+    const issue = await repositories.get('1_payment-required:issue:10')
+    expect(issue.initial).toBeFalsy()
+    expect(issue.type).toEqual('issue')
+    expect(issue.number).toBe(10)
+    expect(issue.repositoryId).toBe('1_payment-required')
+    githubMock.done()
+  })
+})