@cmflow/cli 2.0.0 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmflow/cli",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "An awesome Git Flow",
   "author": "camfou",
   "license": "MIT",
@@ -87,7 +87,7 @@
     "lint_fix": "eslint --fix",
     "release": "node bin/cmrelease.js",
     "release_dry_run": "node bin/cmrelease.js --dry-run",
-    "jira_releases": "node --env-file=.env bin/cm.js jira-releases --project-id CMAB --component API --tag 0.3238.2 --verbose"
+    "jira_releases": "node --env-file=.env bin/cm.js jira-releases --project-id CMAB --component API --tag 0.3241.2 --verbose --update"
   },
   "husky": {
     "hooks": {

package/src/commands/jira-releases.js

@@ -9,9 +9,20 @@ import { updateJiraRelease } from "../common/back/jira/jira-releases.js";
 const TYPES = {
   Story: "feat",
   "Sous-tâche": "tech",
+  Tâche: "chore",
   Bug: "fix"
 };
 
+function getSummary(issue) {
+  return issue.fields.summary
+    .replace("CLONE -", "")
+    .replace("[FEAT]", "")
+    .replace(/\[(.*)]:/, "$1 -")
+    .replace("[BUG]", "")
+    .replace("[FIX]", "")
+    .trim();
+}
+
 export class JiraReleases {
   mapContext(commander, context) {
     return {
@@ -71,11 +82,12 @@ Au menu de cette livraison :
 ${context.releases
   .map((release) => {
     const issues = release.issues.map((issue) => {
-      return ` - ${TYPES[issue.fields.issuetype.name] || issue.fields.issuetype}(${issue.key}): ${issue.fields.summary}`;
+      return ` - ${TYPES[issue.fields.issuetype.name] || issue.fields.issuetype.name}(${issue.key}): ${getSummary(issue)}`;
     });
 
-    return (context.releases.length > 1 ? "- v" + release.version + ":\n" : "") + issues.join(",\n");
+    return issues.length ? (context.releases.length > 1 ? "- v" + release.version + ":\n" : "") + issues.join(",\n") : false;
   })
+  .filter((line) => line !== false)
   .join("\n\n")}
 
 L'équipe API

package/src/common/back/http/http-request.js

@@ -47,7 +47,7 @@ export async function httpRequest(endpoint, options = {}) {
       ...options,
       message: `Fail to retrieved data from ${callee}`,
       url,
-      method,
+      method: method.toUpperCase(),
       status: response.status,
       response: await response.json()
     });
@@ -57,7 +57,7 @@ export async function httpRequest(endpoint, options = {}) {
   console.info({
     message: `Successfully retrieved data from ${callee}`,
     url,
-    method,
+    method: method.toUpperCase(),
     status: response.status
   });
 

package/src/common/back/jira/jira-get-releases-and-issues.js

@@ -29,5 +29,12 @@ export async function jiraGetReleasesAndIssues(projectId, component, tagVersion)
       return release;
     });
 
-  return Promise.all(promises);
+  const [current, ...others] = await Promise.all(promises);
+
+  return [
+    current,
+    ...others.filter((release) => {
+      return !release.released;
+    })
+  ];
 }

package/src/common/back/jira/jira-issue-move-to.js

@@ -23,17 +23,16 @@ export async function jiraIssueMoveTo(issue, toTransition) {
 
   if (transition) {
     await jiraRequest(`/rest/api/3/issue/${issue.key}/transitions`, {
-      method: "POST",
+      method: "post",
       headers: {
         "Content-Type": "application/json",
         Accept: "application/json"
       },
-      body: JSON.stringify({
+      body: {
         transition: {
-          id: transition.id,
-          notifyUsers: false
+          id: transition.id
         }
-      })
+      }
     });
   }
 }

package/src/common/back/jira/jira-releases.js

@@ -16,12 +16,12 @@ export async function updateJiraRelease(release) {
   const endpoint = `/rest/api/3/version/${release.id}`;
 
   await jiraRequest(endpoint, {
-    method: "PUT",
+    method: "put",
     headers: {
       "Content-Type": "application/json",
       Accept: "application/json"
     },
-    body: JSON.stringify({
+    body: {
       id: release.id,
       description: release.description,
       name: release.name,
@@ -29,7 +29,7 @@ export async function updateJiraRelease(release) {
       released: release.released,
       projectId: release.projectId,
       releaseDate: release.releaseDate
-    })
+    }
   });
 }
 

package/src/common/back/jira/jira-request.js

@@ -6,6 +6,10 @@ export async function jiraRequest(endpoint, opts = {}) {
   const jiraUrl = `${JIRA_API}${endpoint}`;
   const auth = Buffer.from(`${JIRA_EMAIL}:${JIRA_TOKEN}`).toString("base64");
 
+  if (opts.body && opts.headers?.["Content-Type"] === "application/json") {
+    opts.body = JSON.stringify(opts.body);
+  }
+
   return httpRequest(jiraUrl, {
     ...opts,
     callee: "JIRA",