From c53083dd7274b3e3ab07e8d986c24484f3e93a19 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Thu, 6 May 2021 11:56:02 +0200 Subject: [PATCH] Update paths --- server/core/schema/mutations/coupon.py | 4 +- server/core/settings.py | 1 - server/core/tests/test_coupon.py | 4 +- server/users/tests/mock_data/me_data.json | 48 +++++------------------ 4 files changed, 14 insertions(+), 43 deletions(-) diff --git a/server/core/schema/mutations/coupon.py b/server/core/schema/mutations/coupon.py index ab309cd8..9d0f672d 100644 --- a/server/core/schema/mutations/coupon.py +++ b/server/core/schema/mutations/coupon.py @@ -1,8 +1,8 @@ import graphene from graphene import relay -from core.hep_client import HepClient, HepClientException -from users.user_signup_login_handler import check_and_create_licenses, create_role_for_user +from oauth.hep_client import HepClient, HepClientException +from oauth.user_signup_login_handler import check_and_create_licenses, create_role_for_user class Coupon(relay.ClientIDMutation): diff --git a/server/core/settings.py b/server/core/settings.py index 50728315..9c20e3db 100644 --- a/server/core/settings.py +++ b/server/core/settings.py @@ -59,7 +59,6 @@ INSTALLED_APPS = [ 'statistics', 'surveys', 'notes', - 'registration', 'news', 'oauth', diff --git a/server/core/tests/test_coupon.py b/server/core/tests/test_coupon.py index 27c30852..45cf975e 100644 --- a/server/core/tests/test_coupon.py +++ b/server/core/tests/test_coupon.py @@ -16,8 +16,8 @@ from graphene.test import Client from api.schema import schema from core.factories import UserFactory -from core.hep_client import HepClient -from core.tests.mock_hep_data_factory import MockResponse, VALID_TEACHERS_ORDERS +from oauth.hep_client import HepClient +from users.tests.mock_hep_data_factory import MockResponse, VALID_TEACHERS_ORDERS from users.models import License, Role, SchoolClass, UserRole diff --git a/server/users/tests/mock_data/me_data.json b/server/users/tests/mock_data/me_data.json index 3dfdc913..5fec04d3 100644 --- a/server/users/tests/mock_data/me_data.json +++ b/server/users/tests/mock_data/me_data.json @@ -1,40 +1,12 @@ { - "id": 49124, - "group_id": 1, - "default_billing": "47579", - "default_shipping": "47579", - "created_at": "2018-07-19 15:05:27", - "updated_at": "2019-11-26 17:04:29", - "created_in": "hep verlag", - "email": "1heptest19072018@mailinator.com", - "first_name": "Test", - "last_name": "Test", - "prefix": "Frau", - "gender": 2, - "store_id": 1, - "website_id": 1, - "addresses": [ - { - "id": 47579, - "customer_id": 49124, - "region": { - "region_code": null, - "region": null, - "region_id": 0 - }, - "region_id": 0, - "country_id": "CH", - "street": [ - "Test" - ], - "telephone": "", - "postcode": "0000", - "city": "Test", - "firstname": "Test", - "lastname": "Test", - "prefix": "Frau", - "default_shipping": true, - "default_billing": true - } - ] + "id": 5, + "email": "hans.meier@iterativ.ch", + "email_verified_at": null, + "salutation": null, + "company": null, + "first_name": "Hans", + "last_name": "Meier", + "phone": null, + "institution": null, + "name": "Hans Meier" }