@corva/create-app 0.54.0-1 → 0.54.0-rc.0

package/lib/flows/lib/api.js

@@ -172,10 +172,11 @@ export class Api {
    * @param {string} wellId
    * @param {string[]} appDatasetsNames
    * @param {string} streamId
+   * @param {number} appConnectionId
    *
    * @returns  {object}
    */
-  async queueAppRun(appId, version, interval, wellId, appDatasetsNames, streamId) {
+  async queueAppRun(appId, version, interval, wellId, appDatasetsNames, streamId, appConnectionId) {
     const json = {
       app_run: {
         app_stream_id: streamId,
@@ -189,6 +190,7 @@ export class Api {
           start: 0,
         },
       },
+      app_connection_id: appConnectionId,
     };
 
     if (interval) {

package/lib/flows/steps/rerun/create-task.js

@@ -18,17 +18,21 @@ export const CREATE_TASK_STEP = {
     api,
     version,
     interval,
-    CORVA_API_ENV,
+    corvaUrl,
   }) => {
     if (!assets.length) {
       logger.write(`\n\n${chalk.yellow.bold('There is no asset ID to create a new task')}`);
     }
 
+    logger.write(`\n    ${corvaUrl}/dev-center/apps/${app.id}/runner`);
+
     let i = 1;
 
     for (const assetId of assets) {
       const wellId = mappedAssetsToWells.get(parseInt(assetId)).id;
-      const streamId = mappedAssetsToStreams.get(parseInt(assetId)).id;
+      const stream = mappedAssetsToStreams.get(parseInt(assetId));
+      const streamId = stream.id;
+      const connectedApps = stream.app_connections.filter((connectedApp) => connectedApp.app_id === Number(app.id));
 
       if (!wellId || !streamId) {
         logger.write(
@@ -41,23 +45,22 @@ export const CREATE_TASK_STEP = {
       }
 
       try {
-        const result = await api
-          .queueAppRun(app.id, version, interval, wellId, appDatasetsNames, streamId)
-          .catch((e) => {
-            console.log(e.response.body);
+        for (const connectedApp of connectedApps) {
+          const extraNotification = connectedApps.length > 1 ? `(connected app ID ${connectedApp.id})` : '';
+          const result = await api
+            .queueAppRun(app.id, version, interval, wellId, appDatasetsNames, stream.id, connectedApp.id)
+            .catch((e) => {
+              console.log(e.response.body);
 
-            throw e;
-          });
+              throw e;
+            });
 
-        logger.write(
-          `\n    ${i}. Created a new task with ID ${chalk.yellow(result.id)} for asset ID - ${chalk.green(assetId)}`,
-        );
+          logger.write(`
+            \n${i}/${assets.length}. Re-run ID ${chalk.yellow(
+            result.id,
+          )} for the asset - ${corvaUrl}/assets/${assetId} ${extraNotification}`);
+        }
 
-        logger.write(
-          `\n    Task link - https://app${
-            CORVA_API_ENV === 'production' ? '.' : `.${CORVA_API_ENV}.`
-          }corva.ai/dev-center/apps/${app.id}/runner`,
-        );
         i++;
       } catch (e) {
         logger.write(

package/lib/flows/steps/rerun/ensure-that-app-in-stream.js

@@ -9,11 +9,11 @@ export const ENSURE_APP_IN_STREAM_TASK_STEP = {
    * @param {object} context
    */
   fn: async (context) => {
-    const { mappedAssetsToStreams, app, api, manifest } = context;
+    const { mappedAssetsToStreams, app, api, manifest, corvaUrl } = context;
 
     await Promise.all(
       [...mappedAssetsToStreams].map(([assetId, stream]) => {
-        return ensureAppIsInTheStream(assetId, stream, app.id, api, manifest);
+        return ensureAppIsInTheStream(assetId, stream, app.id, api, manifest, corvaUrl);
       }),
     );
 
@@ -29,16 +29,27 @@ export const ENSURE_APP_IN_STREAM_TASK_STEP = {
  * @param {string} appId
  * @param {import('../lib/api').Api} api
  * @param {object} manifest
+ * @param {string} corvaUrl
  *
  * @returns {void}
  */
-const ensureAppIsInTheStream = async (assetId, stream, appId, api, manifest) => {
-  const connectedApp = stream.app_connections.find((connection) => connection.app_id === parseInt(appId));
+const ensureAppIsInTheStream = async (assetId, stream, appId, api, manifest, corvaUrl) => {
+  const connectedApps = stream.app_connections.filter((connection) => connection.app_id === parseInt(appId));
+
+  if (connectedApps.length) {
+    if (connectedApps.length > 1) {
+      logger.write(
+        `\n\n${chalk.black.underline.bold(
+          `Attention, this app connected to the stream more than once: ${corvaUrl}/config/streams/${stream.id}, Asset ID: ${assetId}. Logic will make a rerun per each app`,
+        )}`,
+      );
+
+      return;
+    }
 
-  if (connectedApp) {
     logger.write(
       `\n\n${chalk.black.underline.bold(
-        `App has been already connected to the stream ID: ${stream.id}, for asset ID: ${assetId}`,
+        `App has been already connected to the stream: ${corvaUrl}/config/streams/${stream.id}, Asset ID: ${assetId}`,
       )}`,
     );
 
@@ -49,7 +60,7 @@ const ensureAppIsInTheStream = async (assetId, stream, appId, api, manifest) =>
 
   logger.write(
     `\n\n${chalk.black.underline.bold(
-      `Added app to the stream, connect ID - ${chalk.green(newConnection.id)}, for asset ID: ${assetId}`,
+      `Added app to the stream: ${corvaUrl}/config/streams/${stream.id} App: ${corvaUrl}/config/streams/${stream.id}/apps/${newConnection.id}, Asset ID: ${assetId}`,
     )}`,
   );
 };

package/lib/flows/steps/rerun/prepare-data.js

@@ -9,7 +9,7 @@ const MAX_ASSET_IDS_COUNT = 300;
 export const PREPARE_DATA_TASK_STEP = {
   message: 'Preparing and checking data...',
   fn: async (context) => {
-    const { manifest, options, api } = context;
+    const { manifest, options, api, CORVA_API_ENV } = context;
     let { assets, interval, companyId } = options;
 
     if (companyId) {
@@ -51,8 +51,11 @@ export const PREPARE_DATA_TASK_STEP = {
       }
     }
 
+    const corvaUrl = `https://app${CORVA_API_ENV === 'production' ? '.' : `.${CORVA_API_ENV}.`}corva.ai`;
+
     return {
       assets,
+      corvaUrl,
       app,
       options,
       manifest,

package/lib/flows/steps/rerun/prepare-well-and-stream-data.js

@@ -152,7 +152,7 @@ const prepareWellAndStreamData = async (assets, api, manifest) => {
       const streams = await api.getStreamsByAssetIds([assetId], manifest.manifest.application.segments);
 
       if (!streams || !streams.length) {
-        throw new Error(`Could not found streams for asset ID - ${assetId}`);
+        throw new Error(`Could not found streams in Complete status for the asset ID - ${assetId}`);
       }
 
       const stream = await getStreamWithPrompt(streams);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corva/create-app",
-  "version": "0.54.0-1",
+  "version": "0.54.0-rc.0",
   "private": false,
   "description": "Create an app to use it in CORVA.AI",
   "keywords": [
@@ -24,6 +24,7 @@
     "bin/**/*.js",
     "lib/**/*.js",
     "templates",
+    "template_extensions",
     "common"
   ],
   "scripts": {

package/template_extensions/corva/.commitlintrc.json

@@ -0,0 +1,6 @@
+{
+  "extends": ["@commitlint/config-conventional"],
+  "rules": {
+    "subject-case": [0]
+  }
+}

package/template_extensions/corva/.github/pull_request_template.md

@@ -0,0 +1,14 @@
+# Description
+
+[Optional]: a screenshot / video / text description / please check the ticket using the ticket ID
+
+### To be merged the changes also should be approved by:
+
+- QA, PO ( for features / fixes / tech tickets that also require QA/PO validation )
+- Designer ( when there're design changes )
+- BE developer ( when there're MongoDB queries, to be sure they are optimal )
+
+### Checklist
+
+- [ ] I have commented possibly difficult-to-understand places
+- [ ] I have covered the new code with the tests _([Our tests guide](https://corva.notion.site/Tests-guide-520058fa52454e5aa08ef9225d7d76e9))_

package/template_extensions/corva/.github/workflows/code-checks.yml

@@ -0,0 +1,28 @@
+name: Code checks (lint, tests, etc.)
+
+on:
+  push:
+    branches:
+      - feat/*
+      - fix/*
+      - develop
+      - release-fix/[0-9]+.[0-9]+.[0-9]+
+
+jobs:
+  code-checks:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 16
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Run linter
+        run: yarn lint
+
+      - name: Run tests
+        run: yarn coverage

package/template_extensions/corva/.github/workflows/develop.yml

@@ -0,0 +1,29 @@
+name: develop branch flow
+on:
+  push:
+    branches:
+      - 'develop'
+
+jobs:
+  develop-flow:
+    runs-on: ubuntu-latest
+    steps:
+      - name: develop branch flow
+        id: shared-workflow
+        uses: corva-ai/gh-actions/shared-dc-workflows/develop@develop
+        with:
+          is-upload-to-qa: true
+          qa-api-key: ${{ secrets.API_KEY_QA }}
+          is-upload-to-prod: false
+          prod-api-key: ${{ secrets.API_KEY }}
+          npm-token: ${{ secrets.CORVA_NPM_TOKEN }}
+          github-pr-approve-token: ${{ secrets.GH_ACTIONS_AUTOMATION }}
+          # github-pr-approve-token: ${{ secrets.GH_ACTIONS_AUTOMATION }}
+      # - name: trigger circle ci develop e2e tests
+      #   if: ${{ steps.shared-workflow.outputs.is-release-created }}
+      #   run: |
+      #     curl --request POST \
+      #       --url https://circleci.com/api/v2/project/gh/corva-ai/${{ github.event.repository.name }}/pipeline \
+      #       --header 'Circle-Token: ${{ secrets.CIRCLE_CI_API_TOKEN }}' \
+      #       --header 'content-type: application/json' \
+      #       --data '{"branch": "develop", "parameters":{"run_develop_e2e_tests_workflow":true,"app_repository_name":"${{ github.event.repository.name }}"}}'

package/template_extensions/corva/.github/workflows/feat-fix-delete.yml

@@ -0,0 +1,16 @@
+name: branch deletion flow
+on:
+  delete:
+
+jobs:
+  branch-deletion-flow:
+    runs-on: ubuntu-latest
+    if: startsWith(github.event.ref, 'feat/') || startsWith(github.event.ref, 'fix/')
+    steps:
+      - name: branch deletion flow
+        uses: corva-ai/gh-actions/shared-dc-workflows/feat-fix-delete@develop
+        with:
+          is-delete-from-qa: true
+          qa-api-key: ${{ secrets.API_KEY_QA }}
+          is-delete-from-prod: false
+          prod-api-key: ${{ secrets.API_KEY }}

package/template_extensions/corva/.github/workflows/feat-fix.yml

@@ -0,0 +1,32 @@
+name: feat/fix branch flow
+on:
+  push:
+    branches:
+      - feat/*
+      - fix/*
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  feat-fix-flow:
+    runs-on: ubuntu-latest
+    steps:
+      - name: feat/fix flow
+        uses: corva-ai/gh-actions/shared-dc-workflows/feat-fix@develop
+        with:
+          is-upload-to-qa: true
+          qa-api-key: ${{ secrets.API_KEY_QA }}
+          is-upload-to-prod: false
+          prod-api-key: ${{ secrets.API_KEY }}
+          npm-token: ${{ secrets.CORVA_NPM_TOKEN }}
+          jira-user-email: ${{ secrets.JIRA_AUTOTEST_USERNAME }}
+          jira-api-token: ${{ secrets.JIRA_AUTOTEST_API_TOKEN }}
+      # - name: trigger circle ci branch e2e tests
+      #   run: |
+      #     curl --request POST \
+      #       --url https://circleci.com/api/v2/project/gh/corva-ai/${{ github.event.repository.name }}/pipeline \
+      #       --header 'Circle-Token: ${{ secrets.CIRCLE_CI_API_TOKEN }}' \
+      #       --header 'content-type: application/json' \
+      #       --data '{"branch": "${{ github.ref_name	 }}", "parameters":{"run_branch_e2e_tests_workflow":true,"app_repository_name":"${{ github.event.repository.name }}"}}'

package/template_extensions/corva/.github/workflows/release-fix-X.X.X.yml

@@ -0,0 +1,18 @@
+name: release-fix/X.X.X branch flow
+on:
+  push:
+    branches:
+      - 'release-fix/[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+  release-fix-flow:
+    runs-on: ubuntu-latest
+    steps:
+      - name: release-fix/X.X.X flow
+        uses: corva-ai/gh-actions/shared-dc-workflows/release-fix-X.X.X@develop
+        with:
+          is-upload-to-qa: true
+          qa-api-key: ${{ secrets.API_KEY_QA }}
+          is-upload-to-prod: false
+          prod-api-key: ${{ secrets.API_KEY }}
+          npm-token: ${{ secrets.CORVA_NPM_TOKEN }}

package/template_extensions/corva/.github/workflows/validate-pr-title.yml

@@ -0,0 +1,19 @@
+name: 'PR title matches "<type>(<scope>): <description>"'
+
+on:
+  pull_request:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
+
+jobs:
+  validate-pr-title:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate PR title
+        uses: corva-ai/gh-actions/shared-dc-workflows/validate-pr-title@develop

package/template_extensions/corva/.husky/commit-msg

@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+echo "Validating commit message..."
+./node_modules/.bin/commitlint --edit $1

package/template_extensions/corva/.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+./node_modules/.bin/lint-staged