kamil test

Author: Kamilczak020

update_jira/index.js

@@ -5,22 +5,34 @@ const Jira = require('./../utils/jira')
 const statusMap = {
   'master': {
     status: 'Deployed to Production',
-    fields: {}
+    fields: {
+      // prod release timestamp
+      customfield_11475: new Date(),
+      customfield_11473: 'Production',
+    }
   },
   'main': {
     status: 'Deployed to Production',
-    fields: {}
+    fields: {
+      // prod release timestamp
+      customfield_11475: new Date(),
+      customfield_11473: 'Production',
+    }
   },
   'staging': {
     status: 'Deployed to Staging',
     fields: {
       resolution: 'Done',
+      // staging release timestamp
+      customfield_11474: new Date(),
+      customfield_11473: 'Staging',
     }
   },
   'dev': {
     status: 'Deployed to Staging',
     fields: {
-      resolution: 'Done'
+      resolution: 'Done',
+      customfield_11473: 'Development',
     }
   }
 }
@@ -201,12 +213,27 @@ async function handlePushEvent(branch, jiraUtil, githubRepository, githubToken)
 
   // Handle special case: staging -> production bulk update
   if ((branch === 'master' || branch === 'main')) {
+    if (commitMessage === 'from coursedog/staging') {
+
+    } else if (commitMessage.match(/#+[0-9]/)) {
+      // direct from open PR to staging
+      const prNumber = extractPrNumber(commitMessage)
+      const prUrl = `${repositoryName}/pull/${prNumber}`
+      if (!prNumber) return
+      jiraUtil.updateByPR(prUrl, newStatus, preparedFields)
+    }
+
     console.log('Bulk updating all Staging issues to Done')
     const issues = await jiraUtil.updateByStatus('Deployed to Staging', newStatus, preparedFields)
 
     return
   }
 
+  if (branch === 'staging') {
+    console.log('Bulk updating all Deployed to Dev issues to Deployed to Staging')
+    const issues = await jiraUtil.updateByStatus('Deployed to Dev', newStatus, preparedFields)
+  }
+
   // Handle PR merges (look for PR number in commit message)
   const prMatch = commitMessage.match(/#([0-9]+)/)
   if (prMatch) {

update_notion/index.js

@@ -59,7 +59,7 @@ async function _updateNotionStatuses (branch) {
   })
 
   const [ githubOwner, repositoryName ] = GITHUB_REPOSITORY.split('/')
-  
+
   // Get most recent commit to branch
   const { data } = await octokit.rest.repos.getCommit({
     owner: githubOwner,
@@ -103,7 +103,7 @@ async function _updateNotionStatuses (branch) {
         notionUtil.updateByPR(`${repositoryName}/pull/${prNumber}`, 'Completed (Staging)')
       }
       break
-  
+
     default:
       break
   }

utils/jira.js

@@ -223,25 +223,42 @@ class Jira {
   }
 
   /**
-   * Search for issues with a specific status and update them
-   * @param {string} currentStatus - Current status to search for
-   * @param {string} newStatus - New status to transition to
-   * @param {Object} fields - Additional fields to set during transition
+   * Find issues with a specific status
+   * @param {string} status - Status to search for
+   * @param {number} maxResults - Maximum number of results to return (default: 100)
+   * @param {Array<string>} fields - Fields to include in the response (default: ['key', 'summary', 'status'])
+   * @returns {Promise<Array>} Array of issues matching the status
    */
-  async updateByStatus(currentStatus, newStatus, fields = {}) {
+  async findByStatus(status, maxResults = 100, fields = ['key', 'summary', 'status']) {
     try {
-      let jql = `status = "${currentStatus}"`
+      const jql = `status = "${status}"`
       const response = await this.request('/search', {
         method: 'POST',
         body: JSON.stringify({
           jql,
-          fields: ['key', 'summary', 'status'],
-          maxResults: 100
+          fields,
+          maxResults
         })
       })
 
       const data = await response.json()
-      const issues = data.issues
+      console.log(`Found ${data.issues.length} issues in "${status}" status`)
+      return data.issues
+    } catch (error) {
+      console.error(`Error finding issues by status:`, error.message)
+      throw error
+    }
+  }
+
+  /**
+   * Search for issues with a specific status and update them
+   * @param {string} currentStatus - Current status to search for
+   * @param {string} newStatus - New status to transition to
+   * @param {Object} fields - Additional fields to set during transition
+   */
+  async updateByStatus(currentStatus, newStatus, fields = {}) {
+    try {
+      const issues = await this.findByStatus(currentStatus)
       console.log(`Found ${issues.length} issues in "${currentStatus}" status`)
 
       const settledIssuePromises = await Promise.allSettled(
@@ -255,7 +272,6 @@ class Jira {
 
       const rejected = settledIssuePromises.filter((result) => result.status === 'rejected')
       const fullfilled = settledIssuePromises.filter((result) => result.status === 'fulfilled')
-
       console.log(`Sucessfully updated ${fullfilled.length} isssues.`)
 
       if (rejected) {