mirror of
https://github.com/peeringdb/peeringdb.git
synced 2024-05-11 05:55:09 +00:00
Support 202102 (#950)
* install django-grainy * nsp to grainy first iteration * nsp to grainy second iteration * grainy and django-grainy pinned to latest releases * Fix typo * Update djangorestframework, peeringdb, django-ratelimit * Rewrite login view ratelimit decorator * Relock pipfile * add list() to make copy of dictionaries before iterating * relock pipfile with python3.9 change docker to use python3.9 * add ordering to admin search queryset for deskproticket and email * add org api key and begin to write tests * additional key tests * add drf-api-keys to pipfile * Wire orgapikey to modelviewsetpermissions * Update api key helper functions * add put test * Add Org API key tab to frontend * Add user api key model * Update user key handling and tests * Update APIPermissionsApplicator to make it work w requests * Add org api key perm panel * add org key permissions * Add user api key views * Add templates for handling user api key (adding, not revoking) * relock pipfile * assorted fixes and tweaks * Add general user group permissions and org user group perms * refactor org api key perms * Add tests for api keys * Add docstrings to permissions helpers * Add api key examples * squash migrations * remove custom api key header config * Change api key test setup * Update permissions for grainy change * Bump up pipfile and pipfile.lock * Add API Key to Verification Queue Item * Delete travis * Add workaround to Dockerfile * update pipfile and sort out migrations * Add comment to Dockerfile * Re-add API Key migrations * Add locale to .gitignore * remove suggest functionality from ix * Update test to recognize that IX api no longer has suggest function * Add test to outlaw POSTing an IX w its org equal to the suggest entity org * Add meta information geowarning * Add alert to demonstrate UI * Add error to fac update * Add template warning for geovalidation * Add geowarning meta js * cover absent meta_response test case * Update styles for geowarning * refactor geotag warning implementation * null lat and long on unsuccessful geo locate * modify geovalidation frontend update * Add deskproticket model email field * Add missing span * add email to org keys * Add email to org key tests * update serializer with rdap validation wrapper * update admin for api keys * Enable writing an email as part of org key creation * Add email validation to org api key form * fix css style on perm row * Add suggested info to api response * display suggested address on frontend * add needs geocode to serializer * save lat long on forward geonormalization * add address suggestion submit button * Add suggested address popin to ADD facility form * Fix css * add lat and long rounding to geocodenabled model clean method * add migration and regression test for lat long decimal db constraint * Add another regression test for model decimal places * Get deskpro functions passing isort and flake * Update ticket_queue_deletion_prevented * update ticket_queue_deletion_prevented for use with org api key * add template for org key dpt from asnauto skipvq * Update deskproticket for rdap error * add facility aka * add aka to serializer and views * black and isort test api keys * fix typo in org key deskpro template * skip or rewrite unapplicable org key tests, and add as_set tests * adjust api key test comments * Add vqi_notify to signals * Add reversion comments for api keys and helper function * update how org keys are added to verification queue items * rename verification queue item fk from api_key to org_key * fix group id error * update key tests with correct http header info * check both user and key, not just user * templates fiex * adapt deskpro integration to work with email only * make org api keys editable for desc and email * pipfile relock * edit test setupdata settings for groups * Change comment to signify we don't need to remove code * address untranslated accept button * Add docstrings to the serializer functions * Add loading shim * Add migration for all longname and aka * Add aka and long name to views and serializers * delete migration w decimals * standardize serializer lat and long fields * Add clean rounding for lat and long * fix serializer error * api key admin improvements * fix linebreak in user api key form * remove debug prints * Add rounding util * Add rounding to lat and long fields * remove 'clean' from geocode method (logic now in admin form) * remove erroneous tests * revert serializer changes * Fix migrations * Add long name and aka to admin models * Update API key docs * Add documentation for api keys * fix typo * fix org api key revoke broken by editable api keys * doc tweaks * doc tweaks * doc tweaks * black format * fix migration hierarchy * docs * docs * api key permissions screenshot * formatting * formatting * padding fixed * remove one image * fix get_user_from_request type checking take out POST only valdiator for entity suggest * didnt mean to commit the django-peeringdb mount * fix suggest on PUT net fix tests * black formatting * update org key permission template * install rust for cryptography * pipfile relock (django-peeringdb to 2.6) Co-authored-by: Stefan Pratter <stefan@20c.com> Co-authored-by: Elliot Frank <elliot@20c.com>
This commit is contained in:
@@ -1,15 +1,18 @@
|
||||
import pytest
|
||||
import json
|
||||
import re
|
||||
import os
|
||||
|
||||
from django.test import Client, TestCase, RequestFactory
|
||||
from django.contrib.auth.models import Group, AnonymousUser
|
||||
from django.contrib.auth import get_user
|
||||
from django.core.management import call_command
|
||||
import pytest
|
||||
from django.core.exceptions import ValidationError
|
||||
import googlemaps
|
||||
|
||||
import peeringdb_server.models as models
|
||||
from peeringdb_server.serializers import GeocodeSerializerMixin
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def org():
|
||||
org = models.Organization(name="Geocode Org", status="ok")
|
||||
return org
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
@@ -51,12 +54,12 @@ def reverse_parsed():
|
||||
|
||||
|
||||
def test_geo_model_defaults(fac):
|
||||
assert fac.geocode_status == False
|
||||
assert fac.geocode_date == None
|
||||
assert fac.geocode_status is False
|
||||
assert fac.geocode_date is None
|
||||
|
||||
|
||||
def test_geo_model_geocode_coordinates(fac):
|
||||
assert fac.geocode_coordinates == None
|
||||
assert fac.geocode_coordinates is None
|
||||
fac.latitude = 41.876212
|
||||
fac.longitude = -87.631453
|
||||
assert fac.geocode_coordinates == (41.876212, -87.631453)
|
||||
@@ -68,7 +71,7 @@ def test_geo_model_geocode_addresss(fac):
|
||||
|
||||
def test_geo_model_get_address1(fac):
|
||||
data = [{"empty": "empty"}]
|
||||
assert fac.get_address1_from_geocode(data) == None
|
||||
assert fac.get_address1_from_geocode(data) is None
|
||||
|
||||
data = load_json("address1_test0")
|
||||
assert fac.get_address1_from_geocode(data) == "427 S LaSalle St"
|
||||
@@ -81,11 +84,44 @@ def test_geo_model_get_address1(fac):
|
||||
|
||||
|
||||
def test_geo_model_reverse_geocode_blank(fac):
|
||||
with pytest.raises(AttributeError):
|
||||
fac.reverse_geocode(None, "-1,1")
|
||||
|
||||
with pytest.raises(ValidationError) as exc:
|
||||
fac.reverse_geocode(None)
|
||||
fac.reverse_geocode(None, None)
|
||||
message = "Latitude and longitude must be defined for reverse geocode lookup"
|
||||
assert message in str(exc.value)
|
||||
|
||||
|
||||
def test_geo_model_parse_reverse(fac, reverse, reverse_parsed):
|
||||
assert fac.parse_reverse_geocode(reverse) == reverse_parsed
|
||||
|
||||
|
||||
def test_need_address_suggestion(fac):
|
||||
suggested_address = {
|
||||
"name": "Geocode Fac",
|
||||
"status": "ok",
|
||||
"address1": "New street",
|
||||
"address2": "",
|
||||
"city": "New York",
|
||||
"country": "US",
|
||||
"state": "NY",
|
||||
"zipcode": "1234",
|
||||
}
|
||||
geocodeserializer = GeocodeSerializerMixin()
|
||||
assert geocodeserializer.needs_address_suggestion(suggested_address, fac)
|
||||
|
||||
|
||||
def test_does_not_need_address_suggestion(fac):
|
||||
suggested_address = {
|
||||
"name": "Geocode Fac",
|
||||
"status": "ok",
|
||||
"address1": "Some street",
|
||||
"address2": "",
|
||||
"city": "Chicago",
|
||||
"country": "US",
|
||||
"state": "IL",
|
||||
"zipcode": "1234",
|
||||
}
|
||||
geocodeserializer = GeocodeSerializerMixin()
|
||||
assert geocodeserializer.needs_address_suggestion(suggested_address, fac) is False
|
||||
|
Reference in New Issue
Block a user