Rename

ckanext/api_tracking/actions/queries.py

@@ -1,5 +1,5 @@
 from ckan.plugins import toolkit
-from ckanext.tracking.queries.api import (
+from ckanext.api_tracking.queries.api import (
     get_all_token_usage,
     get_most_accessed_dataset_with_token,
     get_most_accessed_token,

ckanext/api_tracking/blueprints/__init__.py

@@ -1,4 +1,4 @@
 # flake8: noqa: F401
 
-from ckanext.tracking.blueprints.csv import tracking_csv_blueprint
-from ckanext.tracking.blueprints.dashboard import tracking_dashboard_blueprint
+from ckanext.api_tracking.blueprints.csv import tracking_csv_blueprint
+from ckanext.api_tracking.blueprints.dashboard import tracking_dashboard_blueprint

ckanext/api_tracking/blueprints/csv.py

@@ -6,7 +6,7 @@
 from ckan.common import current_user
 from ckan.plugins import toolkit
 
-from ckanext.tracking.queries.data import (
+from ckanext.api_tracking.queries.data import (
     all_token_usage_data,
     most_accessed_token_data,
     most_accessed_dataset_with_token_data,

ckanext/api_tracking/blueprints/dashboard.py

@@ -2,9 +2,9 @@
 from flask import Blueprint
 from ckan.plugins.toolkit import render, h
 from ckanext.stats import stats as stats_lib
-from ckanext.tracking.dashboard.stats import get_dataset_views, get_unique_dataset_views, get_resource_downloads
-from ckanext.tracking.dashboard.stats_api import get_api_token_usage_aggregated, get_latest_api_token_usage
-from ckanext.tracking.decorators import require_sysadmin_user
+from ckanext.api_tracking.dashboard.stats import get_dataset_views, get_unique_dataset_views, get_resource_downloads
+from ckanext.api_tracking.dashboard.stats_api import get_api_token_usage_aggregated, get_latest_api_token_usage
+from ckanext.api_tracking.decorators import require_sysadmin_user
 
 
 log = logging.getLogger(__name__)

ckanext/api_tracking/dashboard/stats.py

@@ -4,7 +4,7 @@
 import logging
 from datetime import datetime, timedelta
 from ckan import model
-from ckanext.tracking.dashboard import query_results
+from ckanext.api_tracking.dashboard import query_results
 
 
 log = logging.getLogger(__name__)

ckanext/api_tracking/dashboard/stats_api.py

@@ -3,7 +3,7 @@
 """
 import logging
 from ckan.plugins import toolkit
-from ckanext.tracking.queries.data import (
+from ckanext.api_tracking.queries.data import (
     all_token_usage_data,
     most_accessed_token_data,
     most_accessed_dataset_with_token_data,

ckanext/api_tracking/interfaces.py

@@ -1,7 +1,7 @@
 import logging
 from ckan import plugins
 from ckan.plugins.interfaces import Interface
-from ckanext.tracking.models import TrackingUsage, CKANURL
+from ckanext.api_tracking.models import TrackingUsage, CKANURL
 
 
 log = logging.getLogger(__name__)

ckanext/api_tracking/middleware.py

@@ -7,7 +7,7 @@
 from ckan.model import ApiToken
 from ckan.types import CKANApp
 
-from ckanext.tracking.interfaces import IUsage
+from ckanext.api_tracking.interfaces import IUsage
 
 
 log = logging.getLogger(__name__)

ckanext/api_tracking/models/__init__.py

@@ -1,4 +1,4 @@
 # flake8: noqa: F401
 
-from ckanext.tracking.models.tracking import TrackingUsage
-from ckanext.tracking.models.url import CKANURL
+from ckanext.api_tracking.models.tracking import TrackingUsage
+from ckanext.api_tracking.models.url import CKANURL

ckanext/api_tracking/plugin.py

@@ -2,12 +2,12 @@
 from ckan import plugins
 from ckan.plugins import toolkit
 
-from ckanext.tracking import blueprints
-from ckanext.tracking.interfaces import IUsage
-from ckanext.tracking.middleware import TrackingUsageMiddleware
-from ckanext.tracking.auth import csv as auth_csv
-from ckanext.tracking.auth import queries as auth_queries
-from ckanext.tracking.actions import queries as action_queries
+from ckanext.api_tracking import blueprints
+from ckanext.api_tracking.interfaces import IUsage
+from ckanext.api_tracking.middleware import TrackingUsageMiddleware
+from ckanext.api_tracking.auth import csv as auth_csv
+from ckanext.api_tracking.auth import queries as auth_queries
+from ckanext.api_tracking.actions import queries as action_queries
 
 
 log = logging.getLogger(__name__)

ckanext/api_tracking/queries/api.py

@@ -1,6 +1,6 @@
 from ckan import model
 from sqlalchemy import func, desc
-from ckanext.tracking.models import TrackingUsage
+from ckanext.api_tracking.models import TrackingUsage
 
 
 def get_most_accessed_dataset_with_token(limit=10):

ckanext/api_tracking/queries/data/__init__.py

@@ -1,5 +1,5 @@
 # flake8: noqa: F401
 
-from ckanext.tracking.queries.data.all import all_token_usage_data
-from ckanext.tracking.queries.data.dataset import most_accessed_dataset_with_token_data
-from ckanext.tracking.queries.data.token import most_accessed_token_data
+from ckanext.api_tracking.queries.data.all import all_token_usage_data
+from ckanext.api_tracking.queries.data.dataset import most_accessed_dataset_with_token_data
+from ckanext.api_tracking.queries.data.token import most_accessed_token_data

ckanext/api_tracking/queries/data/all.py

@@ -6,7 +6,7 @@
 from ckan import model
 from ckan.plugins import toolkit
 
-from ckanext.tracking.queries.api import get_all_token_usage
+from ckanext.api_tracking.queries.api import get_all_token_usage
 
 
 log = logging.getLogger(__name__)

ckanext/api_tracking/queries/data/dataset.py

@@ -6,7 +6,7 @@
 from ckan import model
 from ckan.plugins import toolkit
 
-from ckanext.tracking.queries.api import get_most_accessed_dataset_with_token
+from ckanext.api_tracking.queries.api import get_most_accessed_dataset_with_token
 
 
 log = logging.getLogger(__name__)

ckanext/api_tracking/queries/data/token.py

@@ -6,7 +6,7 @@
 from ckan import model
 from ckan.plugins import toolkit
 
-from ckanext.tracking.queries.api import get_most_accessed_token
+from ckanext.api_tracking.queries.api import get_most_accessed_token
 
 
 log = logging.getLogger(__name__)

ckanext/api_tracking/tests/factories.py

@@ -2,7 +2,7 @@
 from ckan import model
 from ckan.plugins import toolkit
 from ckantoolkit.tests import factories
-from ckanext.tracking.models import TrackingUsage
+from ckanext.api_tracking.models import TrackingUsage
 
 
 class TrackingUsageF(factory.Factory):

ckanext/api_tracking/tests/test_csv.py

@@ -4,7 +4,7 @@
 from ckan.lib.helpers import url_for
 from ckan.tests import factories
 
-from ckanext.tracking.tests import factories as tf
+from ckanext.api_tracking.tests import factories as tf
 
 
 @pytest.fixture

ckanext/api_tracking/tests/test_tracking_basic.py

@@ -3,7 +3,7 @@
 from ckan.lib.helpers import url_for
 from ckan.tests import factories
 
-from ckanext.tracking.models.tracking import TrackingUsage
+from ckanext.api_tracking.models.tracking import TrackingUsage
 
 
 class TestTrackingUsageBasic: