From aa64ae8ba533a2aeae29f840585e018de44a34c2 Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Wed, 10 May 2023 10:17:32 -0400 Subject: [PATCH] Unknown Changes --- CustomerNotes/Zenjob.md | 2 + .../main_md2confluence.py | 116 ++++++++-------- .../main_md2confluence_allfiles.py | 127 +++++++++--------- 3 files changed, 117 insertions(+), 128 deletions(-) diff --git a/CustomerNotes/Zenjob.md b/CustomerNotes/Zenjob.md index 64c74181..47cedfd3 100644 --- a/CustomerNotes/Zenjob.md +++ b/CustomerNotes/Zenjob.md @@ -55,3 +55,5 @@ Ideal information in Salesforce: DONE: Added a new group to homepage's access. TODO: Submit tickets from [this page](https://docs.google.com/spreadsheets/d/1kV93XzZuXTbIrh4HfqhZoFwGvBhNxCRZTC36eBqxaV0/edit#gid=0). Specifically: Static Banner (140), Popup (120), And Embed the Website (124). + + diff --git a/Scripts/Backup_Notes_Scripts/main_md2confluence.py b/Scripts/Backup_Notes_Scripts/main_md2confluence.py index 7c4fbd56..fc030e19 100644 --- a/Scripts/Backup_Notes_Scripts/main_md2confluence.py +++ b/Scripts/Backup_Notes_Scripts/main_md2confluence.py @@ -7,112 +7,106 @@ import sys input = sys.argv[1] company = input.split("/")[6] + def readFile(company): rootdir = "/Users/normrasmussen/Documents/Northpass/Scripts/API_Notes/SampleNotes/" - with open(rootdir+company+".md", "r") as companyfile: + with open(rootdir + company + ".md", "r") as companyfile: notes = companyfile.read() notes = markdown.markdown(notes) getContent(company, notes) -def createNewPage(company, notes): + +def createNewPage(company, notes): url = "https://northpass.atlassian.net/wiki/rest/api/content/" auth = HTTPBasicAuth("nrasmussen@northpass.com", "qf9Il7X4wkthgQKBOIly5737") headers = { "X-Atlassian-Token": "no-check", "Accept": "application/json", - "Content-Type": "application/json" + "Content-Type": "application/json", } - payload = json.dumps( { - "type":"page", - "title": company, - "ancestors":[{"id":2210463745}], - "space": - {"key":"~350535240"}, - "body": - {"storage": - {"value": notes, - "representation":"storage"}} - } ) - response = requests.request( - "POST", - url, - data=payload, - headers=headers, - auth=auth + payload = json.dumps( + { + "type": "page", + "title": company, + "ancestors": [{"id": 2210463745}], + "space": {"key": "~350535240"}, + "body": {"storage": {"value": notes, "representation": "storage"}}, + } ) - #print("createNewPage function has run") - response = json.dumps(json.loads(response.text), sort_keys=True, indent=4, separators=(",", ": ")) - #print(response) + response = requests.request("POST", url, data=payload, headers=headers, auth=auth) + # print("createNewPage function has run") + response = json.dumps( + json.loads(response.text), sort_keys=True, indent=4, separators=(",", ": ") + ) + # print(response) exists = "already exists" - # This if statement checks if the response from the call includes that the page already exists. - # If the page does exist, it will get the ID and Version of the page and then run a PUT call to update the page. + # This if statement checks if the response from the call includes that the page already exists. + # If the page does exist, it will get the ID and Version of the page and then run a PUT call to update the page. if exists in response: - #print("This page exists! Updating page instead.") + # print("This page exists! Updating page instead.") getContent(company, notes) + def getContent(company, notes): url = "https://northpass.atlassian.net/wiki/rest/api/content/search?cql=parent=2210463745&expand=body.storage,version" # Found the answer to this URL here: https://community.atlassian.com/t5/Confluence-questions/How-can-i-get-the-page-version-using-a-specific-page-id/qaq-p/898721 auth = HTTPBasicAuth("nrasmussen@northpass.com", "qf9Il7X4wkthgQKBOIly5737") headers = { "Accept": "application/json", - } + } response = requests.request("GET", url, headers=headers, auth=auth) jsonResponse = response.json() - text = json.dumps(json.loads(response.text), sort_keys=True, indent=4, separators=(",",": ")) - #print(text) + text = json.dumps( + json.loads(response.text), sort_keys=True, indent=4, separators=(",", ": ") + ) + # print(text) listCompanies = [] - for response in jsonResponse['results']: - if response['title'] == company: - #print(f"{company} Found.") + for response in jsonResponse["results"]: + if response["title"] == company: + # print(f"{company} Found.") version = int(response["version"]["_links"]["self"][-1]) if version == "": version = 1 else: pass - id = response['id'] - #print(id) - #print(version) + id = response["id"] + # print(id) + # print(version) updatePage(company, notes, id, version) else: listCompanies.append(response["title"]) pass - #print("Other Companies, not pertinent right now. List of companies:") - #print(listCompanies) + # print("Other Companies, not pertinent right now. List of companies:") + # print(listCompanies) + def updatePage(company, notes, id, version): url = f"https://northpass.atlassian.net/wiki/rest/api/content/{id}" - newVersion = version+1 + newVersion = version + 1 auth = HTTPBasicAuth("nrasmussen@northpass.com", "qf9Il7X4wkthgQKBOIly5737") headers = { "X-Atlassian-Token": "no-check", "Accept": "application/json", "Content-Type": "application/json", - "User-Agent" : "python-requests/2.28.1", + "User-Agent": "python-requests/2.28.1", } - payload = json.dumps( { - "version": { - "number": newVersion - }, - "type":"page", - "title": company, - "status": "curent", - "ancestors":[{"id": 2210463745}], - "body": - {"storage": - {"value": notes, - "representation":"storage"}} - } ) - response = requests.request( - "PUT", - url, - data=payload, - headers=headers, - auth=auth + payload = json.dumps( + { + "version": {"number": newVersion}, + "type": "page", + "title": company, + "status": "current", + "ancestors": [{"id": 2210463745}], + "body": {"storage": {"value": notes, "representation": "storage"}}, + } ) - response = json.dumps(json.loads(response.text), sort_keys=True, indent=4, separators=(",", ": ")) - #print(response) - #print("updatePage function has run") + response = requests.request("PUT", url, data=payload, headers=headers, auth=auth) + response = json.dumps( + json.loads(response.text), sort_keys=True, indent=4, separators=(",", ": ") + ) + # print(response) + # print("updatePage function has run") + if __name__ == "__main__": readFile(company) diff --git a/Scripts/Backup_Notes_Scripts/main_md2confluence_allfiles.py b/Scripts/Backup_Notes_Scripts/main_md2confluence_allfiles.py index 1f79571c..2395548e 100644 --- a/Scripts/Backup_Notes_Scripts/main_md2confluence_allfiles.py +++ b/Scripts/Backup_Notes_Scripts/main_md2confluence_allfiles.py @@ -4,124 +4,117 @@ from requests.auth import HTTPBasicAuth import json import os + def findCompanies(): - rootdir = "/Users/normrasmussen/Documents/Northpass/CustomerNotes/" + rootdir = "/Users/normrasmussen/Documents/Work/CustomerNotes/" files = os.listdir(rootdir) for fileName in files: if fileName.startswith(".") or fileName.startswith("ima"): pass else: company = fileName[:-3] - #print(company) + print(company) readFile(company) + def readFile(company): - rootdir = "/Users/normrasmussen/Documents/Northpass/CustomerNotes/" - with open(rootdir+company+".md", "r") as companyfile: + rootdir = "/Users/normrasmussen/Documents/Work/CustomerNotes/" + with open(rootdir + company + ".md", "r") as companyfile: notes = companyfile.read() notes = markdown.markdown(notes) createNewPage(company, notes) -def createNewPage(company, notes): + +def createNewPage(company, notes): url = "https://northpass.atlassian.net/wiki/rest/api/content/" - auth = HTTPBasicAuth("nrasmussen@northpass.com", "qf9Il7X4wkthgQKBOIly5737") + auth = HTTPBasicAuth("nrasmussen@northpass.com", + "ATATT3xFfGF0QZUomC1s3hvD4Hiqh_usOVFAVLsT1n8lt6gzD7wfL8D8x5ner3SE24JD4E590xoT9PKPIi1Eppanx12q5ALzMHKce-KrcIZRT23BvO8MDXwyvbzAO2R4hALc8ZUTI_8-OM-x9o_tjbCHLxEMFOr6QFDYprwdHGZjAxpviSwXrCQ=218AC438") + headers = { "X-Atlassian-Token": "no-check", "Accept": "application/json", - "Content-Type": "application/json" + "Content-Type": "application/json", } - payload = json.dumps( { - "type":"page", - "title": company, - "ancestors":[{"id":2210463745}], - "space": - {"key":"~350535240"}, - "body": - {"storage": - {"value": notes, - "representation":"storage"}} - } ) - response = requests.request( - "POST", - url, - data=payload, - headers=headers, - auth=auth + payload = json.dumps( + { + "type": "page", + "title": company, + "ancestors": [{"id": 2210463745}], + "space": {"key": "~350535240"}, + "body": {"storage": {"value": notes, "representation": "storage"}}, + } ) - #print("createNewPage function has run") + response = requests.request("POST", url, data=payload, headers=headers, auth=auth) + # print("createNewPage function has run") response = json.dumps(json.loads(response.text), sort_keys=True, indent=4, separators=(",", ": ")) - #print(response) exists = "already exists" - # This if statement checks if the response from the call includes that the page already exists. - # If the page does exist, it will get the ID and Version of the page and then run a PUT call to update the page. + # This if statement checks if the response from the call includes that the page already exists. + # If the page does exist, it will get the ID and Version of the page and then run a PUT call to update the page. if exists in response: - #print("This page exists! Updating page instead.") + print("This page exists! Updating page instead.") getContent(company, notes) + def getContent(company, notes): url = "https://northpass.atlassian.net/wiki/rest/api/content/search?cql=parent=2210463745&expand=body.storage,version" # Found the answer to this URL here: https://community.atlassian.com/t5/Confluence-questions/How-can-i-get-the-page-version-using-a-specific-page-id/qaq-p/898721 - auth = HTTPBasicAuth("nrasmussen@northpass.com", "qf9Il7X4wkthgQKBOIly5737") + auth = HTTPBasicAuth("nrasmussen@northpass.com", + "ATATT3xFfGF0QZUomC1s3hvD4Hiqh_usOVFAVLsT1n8lt6gzD7wfL8D8x5ner3SE24JD4E590xoT9PKPIi1Eppanx12q5ALzMHKce-KrcIZRT23BvO8MDXwyvbzAO2R4hALc8ZUTI_8-OM-x9o_tjbCHLxEMFOr6QFDYprwdHGZjAxpviSwXrCQ=218AC438") headers = { "Accept": "application/json", - } + } response = requests.request("GET", url, headers=headers, auth=auth) jsonResponse = response.json() - #print(jsonResponse['']) - text = json.dumps(json.loads(response.text), sort_keys=True, indent=4, separators=(",",": ")) - print(text) + text = json.dumps( + json.loads(response.text), sort_keys=True, indent=4, separators=(",", ": ") + ) listCompanies = [] - for response in jsonResponse['results']: - if response['title'] == company: - #print(f"{company} Found.") + for response in jsonResponse["results"]: + if response["title"] == company: + print(f"{company} Found.") version = int(response["version"]["_links"]["self"][-1]) if version == "": version = 1 else: pass - id = response['id'] - #print(id) - #print(version) + id = response["id"] + # print(id) + # print(version) updatePage(company, notes, id, version) else: listCompanies.append(response["title"]) pass - #print("Other Companies, not pertinent right now. List of companies:") - #print(listCompanies) + # print("Other Companies, not pertinent right now. List of companies:") + # print(listCompanies) + def updatePage(company, notes, id, version): url = f"https://northpass.atlassian.net/wiki/rest/api/content/{id}" - newVersion = version+1 - auth = HTTPBasicAuth("nrasmussen@northpass.com", "qf9Il7X4wkthgQKBOIly5737") + newVersion = version + 1 + auth = HTTPBasicAuth("nrasmussen@northpass.com", + "ATATT3xFfGF0QZUomC1s3hvD4Hiqh_usOVFAVLsT1n8lt6gzD7wfL8D8x5ner3SE24JD4E590xoT9PKPIi1Eppanx12q5ALzMHKce-KrcIZRT23BvO8MDXwyvbzAO2R4hALc8ZUTI_8-OM-x9o_tjbCHLxEMFOr6QFDYprwdHGZjAxpviSwXrCQ=218AC438") headers = { "X-Atlassian-Token": "no-check", "Accept": "application/json", "Content-Type": "application/json", - "User-Agent" : "python-requests/2.28.1", + "User-Agent": "python-requests/2.28.1", } - payload = json.dumps( { - "version": { - "number": newVersion - }, - "type":"page", - "title": company, - "status": "curent", - "ancestors":[{"id": 2210463745}], - "body": - {"storage": - {"value": notes, - "representation":"storage"}} - } ) - response = requests.request( - "PUT", - url, - data=payload, - headers=headers, - auth=auth + payload = json.dumps( + { + "version": {"number": newVersion}, + "type": "page", + "title": company, + "status": "current", + "ancestors": [{"id": 2210463745}], + "body": {"storage": {"value": notes, "representation": "storage"}}, + } ) - response = json.dumps(json.loads(response.text), sort_keys=True, indent=4, separators=(",", ": ")) - #print(response) - #print("updatePage function has run") + response = requests.request("PUT", url, data=payload, headers=headers, auth=auth) + response = json.dumps( + json.loads(response.text), sort_keys=True, indent=4, separators=(",", ": ") + ) + print("updatePage function has run") + if __name__ == "__main__": findCompanies()