faulty merge fixes from test-marshal to dev/main

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
 

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()
+    )