Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 15 additions & 7 deletions api/data_import/import_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,13 +312,6 @@ async def import_data(
import_entity_data["path"].rsplit("/", 1)
)[-1]

# refactor
if entity_cls == FolderEntity and not import_entity_data.get("folder_type"):
import_entity_data["folder_type"] = "Folder"

if entity_cls == TaskEntity and not import_entity_data.get("task_type"):
import_entity_data["task_type"] = default_task_type

logger.debug(
f"entity_id:: {entity_id}:{entity_type} -> {import_entity_data} "
)
Expand All @@ -336,6 +329,10 @@ async def import_data(
)
import_status.updated += 1
else:
await _provide_default_values(
entity_cls, import_entity_data, default_task_type
)

entity_id = await model_cls.create(
user=user, preview=preview, **import_entity_data
)
Expand Down Expand Up @@ -1010,6 +1007,17 @@ async def _resolve_parent_id(
return None, None


async def _provide_default_values(
entity_cls: type, import_entity_data: dict[str, Any], default_task_type: str
):
"""Provides default values for new entities."""
if entity_cls == FolderEntity and not import_entity_data.get("folder_type"):
import_entity_data["folder_type"] = "Folder"

if entity_cls == TaskEntity and not import_entity_data.get("task_type"):
import_entity_data["task_type"] = default_task_type


def _to_bool(value: Any) -> bool:
"""Convert a value to boolean.

Expand Down
25 changes: 14 additions & 11 deletions api/data_import/models.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""Data models for data import/export functionality."""

import copy
from collections.abc import Iterable
from enum import StrEnum
from typing import (
Expand Down Expand Up @@ -304,16 +305,14 @@ def attrib(cls) -> list[ModelField]:

result: list[ModelField] = []
for f in _get_model_fields(cls._entity_model.model.attrib_model).values():
# Create a copy with prefixed name
new_field = ModelField(
name=f"attrib.{f.name}",
type_=getattr(f, "type_", f.annotation),
field_info=f.field_info,
required=f.required,
default=f.default,
model_config=f.model_config,
class_validators=getattr(f, "class_validators", None),
)
new_field = copy.copy(f)
if f.field_info:
new_field.field_info = copy.deepcopy(f.field_info)

new_field.alias = f"attrib.{f.name}"
if new_field.field_info:
new_field.field_info.alias = f"attrib.{f.name}"

result.append(new_field)
return result

Expand Down Expand Up @@ -343,7 +342,11 @@ async def fields(cls, project_name: str | None = None) -> list[ImportableColumn]
for field in all_fields:
name: str | None = None # because of MyPy
if isinstance(field, ModelField):
name = field.name
name = (
field.alias
if (field.alias and field.alias.startswith("attrib."))
else field.name
)
field_info = field.field_info
annotation = field.annotation
required = field.required
Expand Down