Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

22.07 #141

Merged
merged 17 commits into from
Jul 14, 2022
Merged

22.07 #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a1a9f18
Add bulk validation endpoint
HadleyKing May 24, 2022
e91ac51
Completed Bulk BCO validation
HadleyKing May 25, 2022
4e05014
Validator (#123)
HadleyKing Jun 3, 2022
53c5b0b
104 unit testing for api (#125)
HadleyKing Jun 10, 2022
dabe291
Linting with [BLACK](https://github.com/psf/black)
HadleyKing Jun 13, 2022
e120a4b
Fixes for unit tests
HadleyKing Jun 14, 2022
4b7e7da
update tests
HadleyKing Jun 16, 2022
42abcf5
Added a 207 response
HadleyKing Jun 21, 2022
d1f43bf
Update prefix publishing messaging
HadleyKing Jun 21, 2022
779722b
Fix #131
HadleyKing Jun 28, 2022
8a3e02a
Unit test updates
HadleyKing Jun 28, 2022
ab106cc
Update to debugging db
HadleyKing Jun 28, 2022
a5d6597
merge (#136) (#137)
HadleyKing Jul 5, 2022
61d37b9
Testing and Black linting
HadleyKing Jul 5, 2022
4057e90
Abstract validation and added to publish call
HadleyKing Jul 5, 2022
9ff6cd0
Cleaning Utils code
HadleyKing Jul 14, 2022
9026ad5
Merge branch 'main' into 22.07
HadleyKing Jul 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified admin_only/db.sqlite3.dev
View file
Open in desktop
Binary file not shown.
1,286 changes: 482 additions & 804 deletions apitests.py
View file
Open in desktop

Large diffs are not rendered by default.

211 changes: 95 additions & 116 deletions apitests_new.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,159 +2,141 @@
import requests


HEADER = "\033[95m"
OKBLUE = "\033[94m"
OKCYAN = "\033[96m"
OKGREEN = "\033[92m"
WARNING = "\033[93m"
FAIL = "\033[91m"
ENDC = "\033[0m"
BOLD = "\033[1m"
UNDERLINE = "\033[4m"


HEADER = '\033[95m'
OKBLUE = '\033[94m'
OKCYAN = '\033[96m'
OKGREEN = '\033[92m'
WARNING = '\033[93m'
FAIL = '\033[91m'
ENDC = '\033[0m'
BOLD = '\033[1m'
UNDERLINE = '\033[4m'

def pretty_output(
hostname,
method,
test_info,
url,
direct_call = False,
json_send = False,
pull_key = False,
token = False
direct_call=False,
json_send=False,
pull_key=False,
token=False,
):

# Describe the test.
print('\n')
print("\n")
print(f"{BOLD}======= Test {test_info['test_number']} of 16 ======={ENDC}")
print('\n')
print('Description: ' + test_info['description'])
print('\n')
print("\n")
print("Description: " + test_info["description"])
print("\n")

# Is the call constructed or direct?
call = ''
call = ""

if direct_call == True:
call = url
else:
call = hostname + url

# Make the request.
r = ''
r = ""

if method == "GET":

if method == 'GET':

if token != False:

hdrs = {
'Authorization': 'Token {}'.format(token)
}
hdrs = {"Authorization": "Token {}".format(token)}

print(f"{OKCYAN}Call ({method}): {call}")
print(f"Headers: {json.dumps(hdrs, indent = 4)}{ENDC}")
print('\n')

r = requests.get(
call,
headers = hdrs
)
print("\n")

r = requests.get(call, headers=hdrs)

else:

print(f"{OKCYAN}Call ({method}): {call}")
print(f"Headers: None")
print('\n')
print("\n")

r = requests.get(call)

elif method == "POST":

r = requests.get(
call
)

elif method == 'POST':

if token != False:

hdrs = {
'Authorization': 'Token {}'.format(token)
}


hdrs = {"Authorization": "Token {}".format(token)}

print(f"{OKCYAN}Call ({method}): {call}")
print(f"Headers: {json.dumps(hdrs, indent = 4)}")
print(f"Request body: {json.dumps(json_send, indent = 4)}{ENDC}")
print('\n')

r = requests.post(
call,
json = json_send,
headers = hdrs
)

print("\n")

r = requests.post(call, json=json_send, headers=hdrs)

else:

print(f"{OKCYAN}Call ({method}): {call}")
print(f"Headers: None")
print(f"Request body: {json.dumps(json_send, indent = 4)}{ENDC}")
print('\n')

r = requests.post(
call,
json = json_send
)

print("\n")

r = requests.post(call, json=json_send)

print(f"{WARNING}+++ TEST RESULTS +++")
print('\n')
print("\n")

# What did we get?
if str(r.status_code) + ' ' + r.reason == test_info['expected_response_code']:
if str(r.status_code) + " " + r.reason == test_info["expected_response_code"]:

print(
f"{BOLD}{OKGREEN}Expected response code: {test_info['expected_response_code']}"
)
print(
f"{OKGREEN}Receieved response code: {str(r.status_code) + ' ' + r.reason}{ENDC}"
)
print("\n")

print(f"{BOLD}{OKGREEN}Expected response code: {test_info['expected_response_code']}")
print(f"{OKGREEN}Receieved response code: {str(r.status_code) + ' ' + r.reason}{ENDC}")
print('\n')

else:

print(f"{BOLD}{FAIL}Expected response code: {test_info['expected_response_code']}")
print(f"{FAIL}Receieved response code: {str(r.status_code) + ' ' + r.reason}{ENDC}")
print('\n')

print(
f"{BOLD}{FAIL}Expected response code: {test_info['expected_response_code']}"
)
print(
f"{FAIL}Receieved response code: {str(r.status_code) + ' ' + r.reason}{ENDC}"
)
print("\n")

try:

dumped = json.dumps(json.loads(r.text), indent = 4)
dumped = json.dumps(json.loads(r.text), indent=4)

print(f"{OKBLUE}Response")
print('--------')
print("--------")
print(f"{dumped}{ENDC}")
print('\n')
print("\n")

# Do we need to pull anything?
if pull_key != False:

# Is the pull the entire response or
# just one of the keys?

if pull_key == True:
return json.loads(r.text)
else:
return json.loads(r.text)[pull_key]

except json.decoder.JSONDecodeError:

print(f"{BOLD}{FAIL}Response")
print(f"--------")
print(f"Response failed...{ENDC}")
print('\n')
print("\n")




def relationships(
hn,
oi,
user1,
group1,
group2,
wheel_key
):
def relationships(hn, oi, user1, group1, group2, wheel_key):

print("------------Relationship Tests ------------")
# Go through all possible user/group object permissions combinatorially.
Expand All @@ -164,57 +146,54 @@ def relationships(

# Set each test, then compare the object permission
# results with what we would expect.
for value in [1,2,3]:
for perm in ['change', 'delete', 'view']:
# Don't share prefix permissions.
for value in [1, 2, 3]:
for perm in ["change", "delete", "view"]:

# Don't share prefix permissions.

# We can set an arbitrary prefix permission.
# We can set an arbitrary prefix permission.
pretty_output(
hostname = hn,
json_send = {
'POST_api_prefixes_permissions_set': [
hostname=hn,
json_send={
"POST_api_prefixes_permissions_set": [
{
'group': [
'bco_drafter'
],
'permissions': [
'view'
],
'prefix': 'TEST',
'username': [
user1['username']
],
"group": ["bco_drafter"],
"permissions": ["view"],
"prefix": "TEST",
"username": [user1["username"]],
}
],
},
method = 'POST',
test_info = {
'description': 'Set the prefix permissions for a user or a group.',
'expected_response_code': '200 OK'
method="POST",
test_info={
"description": "Set the prefix permissions for a user or a group.",
"expected_response_code": "200 OK",
},
token = user1['token'],
url = '/api/prefixes/permissions/set/'
token=user1["token"],
url="/api/prefixes/permissions/set/",
)

for possibly in [0, 1]:
for perm in ['change', 'delete', 'view']:
for perm in ["change", "delete", "view"]:
print("hi")
# Share prefix permissions

# Share prefix permissions

def superuser ():

def superuser():
print("info")


def account():
print("info")


def publishing():
print("info")


def drafts():
print("info")


def group():
print("info")
print("info")
8 changes: 4 additions & 4 deletions bco_api/api/apps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
from django.db.models.signals import post_migrate
from api.signals import populate_models


class ApiConfig(AppConfig):
"""API Configuration
"""
"""API Configuration"""

default_auto_field = 'django.db.models.AutoField'
name = 'api'
default_auto_field = "django.db.models.AutoField"
name = "api"

def ready(self):
"""Create the anonymous user if they don't exist."""
Expand Down
Loading