Merge branch 'main' into dev-rook-AS-FOIMOD-2740

bcgov · Nov 14, 2024 · 45a5055 · 45a5055
2 parents 956d799 + 03c8d72
commit 45a5055
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 22 deletions.
diff --git a/api/reviewer_api/schemas/finalpackage.py b/api/reviewer_api/schemas/finalpackage.py
@@ -32,7 +32,6 @@ class FinalPackageSchema(Schema):
     )
     summarydocuments = fields.Nested(SummarySchema, allow_none=True)
     redactionlayerid = fields.Int(data_key="redactionlayerid", allow_none=False)
-    pdfstitchjobattributes = fields.Nested(FeeOverrideSchema, allow_none=True, many=False)
     requesttype = fields.Str(data_key="requesttype", allow_none=False)
     pdfstitchjobattributes = fields.Nested(FeeOverrideSchema, allow_none=True, many=False)
 

diff --git a/api/reviewer_api/services/radactionservice.py b/api/reviewer_api/services/radactionservice.py
@@ -164,7 +164,6 @@ def __preparemessageforsummaryservice(self, messageschema, userinfo, job):
             "attributes": to_json(messageschema["attributes"]),
             "summarydocuments": json.dumps(messageschema["summarydocuments"]),
             "redactionlayerid": json.dumps(messageschema["redactionlayerid"]),
-            "feeoverridereason":feeoverridereason,
             "requesttype": messageschema["requesttype"],
             "feeoverridereason":feeoverridereason
         }

diff --git a/computingservices/DocumentServices/rstreamio/message/schemas/redactionsummary.py b/computingservices/DocumentServices/rstreamio/message/schemas/redactionsummary.py
@@ -43,7 +43,6 @@ def __init__(self, jobid, requestid, ministryrequestid, category, requestnumber,
         self.attributes = attributes
         self.summarydocuments = summarydocuments
         self.redactionlayerid = redactionlayerid
-        self.feeoverridereason = feeoverridereason
         self.requesttype = requesttype
         self.feeoverridereason = feeoverridereason
 

diff --git a/computingservices/ZippingServices/services/zipperservice.py b/computingservices/ZippingServices/services/zipperservice.py
@@ -172,21 +172,4 @@ def __getzipfilepath(foldername, filename):
         foldername.capitalize() + "/" + filename + ".zip"
         if foldername is not None
         else filename + ".zip"
-    )
-
-
-def __removesensitivecontent(documentbytes):
-    # clear metadata
-    reader2 = PyPDF2.PdfReader(BytesIO(documentbytes))
-    # Check if metadata exists.
-    if reader2.metadata is not None:
-        # Create a new PDF file without metadata.
-        writer = PyPDF2.PdfWriter()
-        # Copy pages from the original PDF to the new PDF.
-        for page_num in range(len(reader2.pages)):
-            page = reader2.pages[page_num]                
-            writer.add_page(page)        
-        #writer.remove_links() # to remove comments.
-        buffer = BytesIO()
-        writer.write(buffer)
-        return buffer.getvalue()
+    )
diff --git a/web/src/components/FOI/Home/Home.js b/web/src/components/FOI/Home/Home.js
@@ -109,7 +109,7 @@ function Home() {
           });
 
           let doclist = [];          
-          let requestInfo = _requestInfo.requestinfo;
+          let requestInfo = _requestInfo;
           getFOIS3DocumentPreSignedUrls(
             documentObjs,
             (newDocumentObjs) => {