Dev rook

.github/workflows/pagecountcalculator-cd.yml

@@ -0,0 +1,113 @@
+name: PageCountCalculator CD
+
+
+on:
+  push:
+    branches:
+      - dev
+      - main
+      - dev-marshal
+      - test-marshal
+      - dev-rook
+      - test-rook
+    paths:
+      - "computingservices/PageCountCalculator/**"
+      - ".github/workflows/pagecountcalculator-cd.yml"
+
+defaults:
+  run:
+    shell: bash
+    working-directory: ./computingservices/PageCountCalculator
+
+env:
+  APP_NAME: "reviewer-pagecountcalculator"
+  TOOLS_NAME: "${{secrets.OPENSHIFT4_REPOSITORY}}"
+
+jobs:
+  pagecountcalculator-cd-by-push:
+    runs-on: ubuntu-20.04
+
+    if: github.event_name == 'push' && github.repository == 'bcgov/foi-docreviewer'
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set ENV variables for dev branch
+        if: ${{ github.ref_name == 'dev' }}
+        shell: bash
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=dev" >> $GITHUB_ENV
+          echo "BRANCH_NAME=dev" >> $GITHUB_ENV
+          echo "ENV_NAME=dev" >> $GITHUB_ENV
+
+      - name: Set ENV variables for main branch
+        if: ${{ github.ref_name == 'main' }}
+        shell: bash
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=test" >> $GITHUB_ENV
+          echo "BRANCH_NAME=main" >> $GITHUB_ENV
+          echo "ENV_NAME=test" >> $GITHUB_ENV
+
+      - name: Set ENV variables for dev-marshal branch
+        if: ${{ github.ref_name == 'dev-marshal' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=dev-marshal" >> $GITHUB_ENV
+          echo "BRANCH_NAME=dev-marshal" >> $GITHUB_ENV
+          echo "ENV_NAME=dev" >> $GITHUB_ENV
+
+      - name: Set ENV variables for test-marshal branch
+        if: ${{ github.ref_name == 'test-marshal' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=test-marshal" >> $GITHUB_ENV
+          echo "BRANCH_NAME=test-marshal" >> $GITHUB_ENV
+          echo "ENV_NAME=test" >> $GITHUB_ENV
+
+      - name: Set ENV variables for dev-rook branch
+        if: ${{ github.ref_name == 'dev-rook' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=dev-rook" >> $GITHUB_ENV
+          echo "BRANCH_NAME=dev-rook" >> $GITHUB_ENV
+          echo "ENV_NAME=dev" >> $GITHUB_ENV
+          echo "ENV_TAG_NAME=rook" >> $GITHUB_ENV
+
+      - name: Set ENV variables for test-rook branch
+        if: ${{ github.ref_name == 'test-rook' }}
+        run: |
+          echo "For ${{ github.ref_name }} branch"
+          echo "TAG_NAME=test-rook" >> $GITHUB_ENV
+          echo "BRANCH_NAME=test-rook" >> $GITHUB_ENV
+          echo "ENV_NAME=test" >> $GITHUB_ENV
+          echo "ENV_TAG_NAME=rook" >> $GITHUB_ENV
+
+      - name: Login Openshift
+        shell: bash
+        run: |
+          oc login --server=${{secrets.OPENSHIFT4_LOGIN_REGISTRY}} --token=${{secrets.OPENSHIFT4_SA_TOKEN}}
+
+      - name: Tools project
+        shell: bash
+        run: |
+          oc project ${{ env.TOOLS_NAME }}-tools
+
+      - name: Build from ${{ env.BRANCH_NAME }} branch
+        shell: bash
+        run: |
+          oc patch bc/${{ env.APP_NAME }}-build -p '{"spec":{"source":{"contextDir":"/computingservices/PageCountCalculator","git":{"ref":"${{ env.BRANCH_NAME }}"}}}}'
+
+      - name: Start Build Openshift
+        shell: bash
+        run: |
+          oc start-build ${{ env.APP_NAME }}-build --wait
+
+      - name: Tag+Deploy for ${{ env.TAG_NAME }}
+        shell: bash
+        run: |
+          oc tag ${{ env.APP_NAME }}:latest ${{ env.APP_NAME }}:${{ env.TAG_NAME }}
+
+      # - name: Watch new rollout (trigger by image change in Openshift)
+      #   shell: bash
+      #   run: |
+      #     oc rollout status dc/${{ env.APP_NAME }}-{{ env.ENV_TAG_NAME }} -n ${{ env.TOOLS_NAME }}-${{ env.ENV_NAME }} -w

.github/workflows/pagecountcalculator-ci.yml

@@ -0,0 +1,54 @@
+name: PageCountCalculator CI
+
+
+on:
+  pull_request:
+    branches:
+      - main
+      - dev
+      - dev-marshal
+      - test-marshal
+      - dev-rook
+      - test-rook
+    paths:
+      - "computingservices/PageCountCalculator/**"
+
+defaults:
+  run:
+    shell: bash
+    working-directory: ./computingservices/PageCountCalculator
+
+jobs:
+  docker-build-check:
+    runs-on: ubuntu-20.04
+    name: Build dockerfile to ensure it works
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: docker build to check strictness
+        id: docker-build
+        run: |
+          docker build -f Dockerfile.local .
+
+  python-build-check:
+    runs-on: ubuntu-20.04
+    name: Build python to ensure it works
+
+    strategy:
+      matrix:
+        # python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.9]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install flake8 pytest
+          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+
+

.gitignore

@@ -26,6 +26,7 @@ computingservices/poc/env/*
 computingservices/DedupeServices/env/*
 computingservices/PDFStitchServices/env/*
 computingservices/ZippingServices/env/*
+computingservices/PageCountCalculator/env/*
 
 
 ################################################################################

api/migrations/versions/c787e6d82903_PageCalculatorJob.py

@@ -0,0 +1,36 @@
+"""empty message
+
+Revision ID: c787e6d82903
+Revises: 549893ea9059
+Create Date: 2024-02-06 15:12:03.310271
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+
+# revision identifiers, used by Alembic.
+revision = 'c787e6d82903'
+down_revision = '549893ea9059'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.create_table('PageCalculatorJob',
+        sa.Column('pagecalculatorjobid', sa.Integer(), primary_key=True, autoincrement=True, nullable=False),
+        sa.Column('version', sa.Integer(), nullable=False),
+        sa.Column('ministryrequestid', sa.Integer(), nullable=False),
+        sa.Column('inputmessage', postgresql.JSON(astext_type=sa.Text()), nullable=False), 
+        sa.Column('pagecount', postgresql.JSON(astext_type=sa.Text()), nullable=True), 
+        sa.Column('status', sa.String(length=120), nullable=False), 
+        sa.Column('message', sa.Text, nullable=True),
+        sa.Column('createdat', sa.TIMESTAMP, nullable=False, server_default=sa.func.now()),
+        sa.Column('createdby', sa.String(length=120), nullable=True), 
+        sa.PrimaryKeyConstraint('pagecalculatorjobid', 'version')
+    )
+
+
+def downgrade():
+    op.drop_table('PageCalculatorJob')

api/reviewer_api/models/PageCalculatorJob.py

@@ -0,0 +1,51 @@
+from .db import db, ma
+from datetime import datetime as datetime2
+from sqlalchemy.dialects.postgresql import JSON
+from sqlalchemy import func, and_
+from .default_method_result import DefaultMethodResult
+import logging
+
+
+class PageCalculatorJob(db.Model):
+    __tablename__ = "PageCalculatorJob"
+    # Defining the columns
+    pagecalculatorjobid = db.Column(db.Integer, primary_key=True, autoincrement=True)
+    version = db.Column(db.Integer, primary_key=True, nullable=False)
+    ministryrequestid = db.Column(db.Integer, nullable=False)
+    inputmessage = db.Column(JSON, nullable=False)
+    pagecount = db.Column(JSON, nullable=True)
+    status = db.Column(db.String(120), nullable=False)
+    message = db.Column(db.Text, nullable=True)
+    createdat = db.Column(db.DateTime, default=datetime2.now, nullable=False)
+    createdby = db.Column(db.String(120), nullable=False)
+
+    @classmethod
+    def insert(cls, row):
+        try:
+            db.session.add(row)
+            db.session.commit()
+            return DefaultMethodResult(
+                True,
+                "PageCalculatorJob recorded for ministryrequestid: {0}".format(
+                    row.ministryrequestid
+                ),
+                row.pagecalculatorjobid,
+            )
+        except Exception as ex:
+            logging.error(ex)
+        finally:
+            db.session.close()
+
+class PageCalculatorJobSchema(ma.Schema):
+    class Meta:
+        fields = (
+            "pagecalculatorjobid",
+            "version",
+            "ministryrequestid",
+            "inputmessage",
+            "pagecount",
+            "status",
+            "message",
+            "createdat",
+            "createdby",
+        )

api/reviewer_api/resources/jobstatus.py

@@ -108,5 +108,26 @@ def get(requestid, category):
             return {'status': False, 'message': CUSTOM_KEYERROR_MESSAGE + str(error)}, 400
         except BusinessException as exception:
             return {'status': exception.status_code, 'message':exception.message}, 500
+
+# this is for inflight request pagecount calculation option 2
+@cors_preflight('POST,OPTIONS')
+@API.route('/pagecalculatorjobstatus')
+class AddPageCalculatorJobStatus(Resource):
+    """Insert entries into job record table.
+    """
+    @staticmethod
+    # @TRACER.trace()
+    @cross_origin(origins=allowedorigins())
+    @auth.require
+    def post():
+        try:
+            requestjson = request.get_json()
+            result = jobrecordservice().insertpagecalculatorjobstatus(requestjson, AuthHelper.getuserid())
+            respcode = 200 if result.success == True else 500
+            return {'status': result.success, 'message':result.message,'id':result.identifier}, respcode
+        except KeyError as error:
+            return {'status': False, 'message': CUSTOM_KEYERROR_MESSAGE + str(error)}, 400
+        except BusinessException as exception:
+            return {'status': exception.status_code, 'message':exception.message}, 500
 
 

api/reviewer_api/services/documentservice.py

@@ -2,20 +2,22 @@
 from reviewer_api.models.DocumentMaster import DocumentMaster
 from reviewer_api.models.FileConversionJob import FileConversionJob
 from reviewer_api.models.DeduplicationJob import DeduplicationJob
+from reviewer_api.models.PageCalculatorJob import PageCalculatorJob
 from datetime import datetime as datetime2, timezone
 from os import path
 from reviewer_api.models.DocumentDeleted import DocumentDeleted
 import json
 from reviewer_api.utils.util import pstformat
 from reviewer_api.models.DocumentAttributes import DocumentAttributes
 from reviewer_api.services.pdfstitchpackageservice import pdfstitchpackageservice
+from reviewer_api.services.external.eventqueueproducerservice import eventqueueproducerservice
 import requests
 from reviewer_api.auth import auth, AuthHelper
 from os import getenv
 from reviewer_api.utils.enums import StateName
 
 requestapiurl = getenv("FOI_REQ_MANAGEMENT_API_URL")
-
+pagecalculatorstreamkey = getenv("PAGECALCULATOR_STREAM_KEY")
 
 class documentservice:
     def getdedupestatus(self, requestid):
@@ -39,7 +41,6 @@ def getdedupestatus(self, requestid):
                 record["attachments"] = self.__getattachments(
                     records, record["documentmasterid"], []
                 )
-
         # Duplicate check
         finalresults = []
         (
@@ -354,7 +355,7 @@ def __getuploadedrecord(self, records, masterid):
 
     def deletedocument(self, payload, userid):
         """Inserts document into list of deleted documents"""
-        return DocumentDeleted.create(
+        result = DocumentDeleted.create(
             [
                 DocumentDeleted(
                     filepath=path.splitext(filepath)[0],
@@ -366,6 +367,22 @@ def deletedocument(self, payload, userid):
                 for filepath in payload["filepaths"]
             ]
         )
+        if result.success:
+                streamobject = {
+                        'ministryrequestid': payload["ministryrequestid"]
+                    }
+                row = PageCalculatorJob(
+                    version=1,
+                    ministryrequestid=payload["ministryrequestid"],
+                    inputmessage=streamobject,
+                    status='pushedtostream',
+                    createdby='delete'
+                )
+                job = PageCalculatorJob.insert(row)
+                streamobject["jobid"] = job.identifier
+                streamobject["createdby"] = 'delete'
+                eventqueueproducerservice().add(pagecalculatorstreamkey, streamobject)
+        return result
 
     def updatedocumentattributes(self, payload, userid):
         """update document attributes"""
@@ -418,7 +435,6 @@ def getdocuments(self, requestid,bcgovcode):
             for document in self.getdedupestatus(requestid)
         }
         attachments = []
-
         for documentid in documents:
             _attachments = documents[documentid].pop("attachments", [])
             for attachment in _attachments:

api/reviewer_api/services/external/zipperproducerservice.py → api/reviewer_api/services/external/eventqueueproducerservice.py

@@ -5,7 +5,7 @@
 from os import getenv
 
 
-class zipperproducerservice:
+class eventqueueproducerservice:
     """This class is reserved for integration with event queue (currently redis streams)."""
 
     host = os.getenv("ZIPPER_REDIS_HOST")
@@ -25,4 +25,4 @@ def add(self, payload):
             return DefaultMethodResult(False, err, -1)
 
     def __streamkey(self):
-        return getenv("ZIPPER_STREAM_KEY")  
+        return getenv("ZIPPER_STREAM_KEY")