From 13d4121fc275a94c6d2a53d9d894e6754c24f740 Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Sun, 27 Dec 2020 18:54:06 +0200
Subject: [PATCH] Move utility functions to utils.

---
 etebase_fastapi/collection.py | 15 ++-------------
 etebase_fastapi/utils.py      | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/etebase_fastapi/collection.py b/etebase_fastapi/collection.py
index 8eabf9a..25883f8 100644
--- a/etebase_fastapi/collection.py
+++ b/etebase_fastapi/collection.py
@@ -1,4 +1,3 @@
-import dataclasses
 import typing as t
 
 from asgiref.sync import sync_to_async
@@ -8,7 +7,7 @@ from django.core.files.base import ContentFile
 from django.db import transaction
 from django.db.models import Q
 from django.db.models import QuerySet
-from fastapi import APIRouter, Depends, status, Query, Request
+from fastapi import APIRouter, Depends, status, Request
 from pydantic import BaseModel
 
 from django_etebase import models
@@ -16,7 +15,7 @@ from .authentication import get_authenticated_user
 from .exceptions import ValidationError, transform_validation_error
 from .msgpack import MsgpackRoute, MsgpackResponse
 from .stoken_handler import filter_by_stoken_and_limit, filter_by_stoken, get_stoken_obj, get_queryset_stoken
-from .utils import get_object_or_404
+from .utils import get_object_or_404, Context, Prefetch, PrefetchQuery
 
 User = get_user_model()
 collection_router = APIRouter(route_class=MsgpackRoute)
@@ -24,16 +23,6 @@ default_queryset: QuerySet = models.Collection.objects.all()
 default_item_queryset: QuerySet = models.CollectionItem.objects.all()
 
 
-Prefetch = t.Literal["auto", "medium"]
-PrefetchQuery = Query(default="auto")
-
-
-@dataclasses.dataclass
-class Context:
-    user: t.Optional[User]
-    prefetch: t.Optional[Prefetch]
-
-
 class ListMulti(BaseModel):
     collectionTypes: t.List[bytes]
 
diff --git a/etebase_fastapi/utils.py b/etebase_fastapi/utils.py
index d7f8c09..d9bef73 100644
--- a/etebase_fastapi/utils.py
+++ b/etebase_fastapi/utils.py
@@ -1,10 +1,25 @@
-from fastapi import status
+import dataclasses
+import typing as t
+
+from fastapi import status, Query
 
 from django.db.models import QuerySet
 from django.core.exceptions import ObjectDoesNotExist
+from django.contrib.auth import get_user_model
 
 from .exceptions import ValidationError
 
+User = get_user_model()
+
+Prefetch = t.Literal["auto", "medium"]
+PrefetchQuery = Query(default="auto")
+
+
+@dataclasses.dataclass
+class Context:
+    user: t.Optional[User]
+    prefetch: t.Optional[Prefetch]
+
 
 def get_object_or_404(queryset: QuerySet, **kwargs):
     try: