diff --git a/src/wuttafarm/db/alembic/versions/1b2d3224e5dc_add_animals.py b/src/wuttafarm/db/alembic/versions/1b2d3224e5dc_add_animals.py index 18ab1c0..78400ac 100644 --- a/src/wuttafarm/db/alembic/versions/1b2d3224e5dc_add_animals.py +++ b/src/wuttafarm/db/alembic/versions/1b2d3224e5dc_add_animals.py @@ -35,16 +35,14 @@ def upgrade() -> None: sa.Column("notes", sa.Text(), nullable=True), sa.Column("image_url", sa.String(length=255), nullable=True), sa.Column("farmos_uuid", wuttjamaican.db.util.UUID(), nullable=True), - sa.Column("drupal_internal_id", sa.Integer(), nullable=True), + sa.Column("drupal_id", sa.Integer(), nullable=True), sa.ForeignKeyConstraint( ["animal_type_uuid"], ["animal_type.uuid"], name=op.f("fk_animal_animal_type_uuid_animal_type"), ), sa.PrimaryKeyConstraint("uuid", name=op.f("pk_animal")), - sa.UniqueConstraint( - "drupal_internal_id", name=op.f("uq_animal_drupal_internal_id") - ), + sa.UniqueConstraint("drupal_id", name=op.f("uq_animal_drupal_id")), sa.UniqueConstraint("farmos_uuid", name=op.f("uq_animal_farmos_uuid")), ) op.create_table( @@ -73,9 +71,7 @@ def upgrade() -> None: autoincrement=False, nullable=True, ), - sa.Column( - "drupal_internal_id", sa.Integer(), autoincrement=False, nullable=True - ), + sa.Column("drupal_id", sa.Integer(), autoincrement=False, nullable=True), sa.Column( "transaction_id", sa.BigInteger(), autoincrement=False, nullable=False ), diff --git a/src/wuttafarm/db/alembic/versions/2b6385d0fa17_add_animal_types.py b/src/wuttafarm/db/alembic/versions/2b6385d0fa17_add_animal_types.py index 7ddc814..4e1481f 100644 --- a/src/wuttafarm/db/alembic/versions/2b6385d0fa17_add_animal_types.py +++ b/src/wuttafarm/db/alembic/versions/2b6385d0fa17_add_animal_types.py @@ -30,11 +30,9 @@ def upgrade() -> None: sa.Column("description", sa.String(length=255), nullable=True), sa.Column("changed", sa.DateTime(), nullable=True), sa.Column("farmos_uuid", wuttjamaican.db.util.UUID(), nullable=True), - sa.Column("drupal_internal_id", sa.Integer(), nullable=True), + sa.Column("drupal_id", sa.Integer(), nullable=True), sa.PrimaryKeyConstraint("uuid", name=op.f("pk_animal_type")), - sa.UniqueConstraint( - "drupal_internal_id", name=op.f("uq_animal_type_drupal_internal_id") - ), + sa.UniqueConstraint("drupal_id", name=op.f("uq_animal_type_drupal_id")), sa.UniqueConstraint("farmos_uuid", name=op.f("uq_animal_type_farmos_uuid")), sa.UniqueConstraint("name", name=op.f("uq_animal_type_name")), ) @@ -53,9 +51,7 @@ def upgrade() -> None: autoincrement=False, nullable=True, ), - sa.Column( - "drupal_internal_id", sa.Integer(), autoincrement=False, nullable=True - ), + sa.Column("drupal_id", sa.Integer(), autoincrement=False, nullable=True), sa.Column( "transaction_id", sa.BigInteger(), autoincrement=False, nullable=False ), diff --git a/src/wuttafarm/db/alembic/versions/4dbba8aeb1e5_add_structures.py b/src/wuttafarm/db/alembic/versions/4dbba8aeb1e5_add_structures.py index 823f826..94e8186 100644 --- a/src/wuttafarm/db/alembic/versions/4dbba8aeb1e5_add_structures.py +++ b/src/wuttafarm/db/alembic/versions/4dbba8aeb1e5_add_structures.py @@ -34,16 +34,14 @@ def upgrade() -> None: sa.Column("notes", sa.Text(), nullable=True), sa.Column("image_url", sa.String(length=255), nullable=True), sa.Column("farmos_uuid", wuttjamaican.db.util.UUID(), nullable=True), - sa.Column("drupal_internal_id", sa.Integer(), nullable=True), + sa.Column("drupal_id", sa.Integer(), nullable=True), sa.ForeignKeyConstraint( ["structure_type_uuid"], ["structure_type.uuid"], name=op.f("fk_structure_structure_type_uuid_structure_type"), ), sa.PrimaryKeyConstraint("uuid", name=op.f("pk_structure")), - sa.UniqueConstraint( - "drupal_internal_id", name=op.f("uq_structure_drupal_internal_id") - ), + sa.UniqueConstraint("drupal_id", name=op.f("uq_structure_drupal_id")), sa.UniqueConstraint("farmos_uuid", name=op.f("uq_structure_farmos_uuid")), sa.UniqueConstraint("name", name=op.f("uq_structure_name")), ) @@ -72,9 +70,7 @@ def upgrade() -> None: autoincrement=False, nullable=True, ), - sa.Column( - "drupal_internal_id", sa.Integer(), autoincrement=False, nullable=True - ), + sa.Column("drupal_id", sa.Integer(), autoincrement=False, nullable=True), sa.Column( "transaction_id", sa.BigInteger(), autoincrement=False, nullable=False ), diff --git a/src/wuttafarm/db/alembic/versions/6c56bcd1c028_add_wuttafarmuser.py b/src/wuttafarm/db/alembic/versions/6c56bcd1c028_add_wuttafarmuser.py index 32fa175..0dc2d29 100644 --- a/src/wuttafarm/db/alembic/versions/6c56bcd1c028_add_wuttafarmuser.py +++ b/src/wuttafarm/db/alembic/versions/6c56bcd1c028_add_wuttafarmuser.py @@ -27,7 +27,7 @@ def upgrade() -> None: "wuttafarm_user", sa.Column("uuid", wuttjamaican.db.util.UUID(), nullable=False), sa.Column("farmos_uuid", wuttjamaican.db.util.UUID(), nullable=True), - sa.Column("drupal_internal_id", sa.Integer(), nullable=True), + sa.Column("drupal_id", sa.Integer(), nullable=True), sa.ForeignKeyConstraint( ["uuid"], ["user.uuid"], name=op.f("fk_wuttafarm_user_uuid_user") ), @@ -44,9 +44,7 @@ def upgrade() -> None: autoincrement=False, nullable=True, ), - sa.Column( - "drupal_internal_id", sa.Integer(), autoincrement=False, nullable=True - ), + sa.Column("drupal_id", sa.Integer(), autoincrement=False, nullable=True), sa.Column( "transaction_id", sa.BigInteger(), autoincrement=False, nullable=False ), diff --git a/src/wuttafarm/db/alembic/versions/92b813360b99_add_groups.py b/src/wuttafarm/db/alembic/versions/92b813360b99_add_groups.py index 66a79ec..7223844 100644 --- a/src/wuttafarm/db/alembic/versions/92b813360b99_add_groups.py +++ b/src/wuttafarm/db/alembic/versions/92b813360b99_add_groups.py @@ -32,11 +32,9 @@ def upgrade() -> None: sa.Column("active", sa.Boolean(), nullable=False), sa.Column("notes", sa.Text(), nullable=True), sa.Column("farmos_uuid", wuttjamaican.db.util.UUID(), nullable=True), - sa.Column("drupal_internal_id", sa.Integer(), nullable=True), + sa.Column("drupal_id", sa.Integer(), nullable=True), sa.PrimaryKeyConstraint("uuid", name=op.f("pk_group")), - sa.UniqueConstraint( - "drupal_internal_id", name=op.f("uq_group_drupal_internal_id") - ), + sa.UniqueConstraint("drupal_id", name=op.f("uq_group_drupal_id")), sa.UniqueConstraint("farmos_uuid", name=op.f("uq_group_farmos_uuid")), sa.UniqueConstraint("name", name=op.f("uq_group_name")), ) @@ -56,9 +54,7 @@ def upgrade() -> None: autoincrement=False, nullable=True, ), - sa.Column( - "drupal_internal_id", sa.Integer(), autoincrement=False, nullable=True - ), + sa.Column("drupal_id", sa.Integer(), autoincrement=False, nullable=True), sa.Column( "transaction_id", sa.BigInteger(), autoincrement=False, nullable=False ), diff --git a/src/wuttafarm/db/alembic/versions/9f2243df9566_add_land_types.py b/src/wuttafarm/db/alembic/versions/9f2243df9566_add_land_types.py index 4e45439..15d89fa 100644 --- a/src/wuttafarm/db/alembic/versions/9f2243df9566_add_land_types.py +++ b/src/wuttafarm/db/alembic/versions/9f2243df9566_add_land_types.py @@ -28,11 +28,9 @@ def upgrade() -> None: sa.Column("uuid", wuttjamaican.db.util.UUID(), nullable=False), sa.Column("name", sa.String(length=100), nullable=False), sa.Column("farmos_uuid", wuttjamaican.db.util.UUID(), nullable=True), - sa.Column("drupal_internal_id", sa.String(length=50), nullable=True), + sa.Column("drupal_id", sa.String(length=50), nullable=True), sa.PrimaryKeyConstraint("uuid", name=op.f("pk_land_type")), - sa.UniqueConstraint( - "drupal_internal_id", name=op.f("uq_land_type_drupal_internal_id") - ), + sa.UniqueConstraint("drupal_id", name=op.f("uq_land_type_drupal_id")), sa.UniqueConstraint("farmos_uuid", name=op.f("uq_land_type_farmos_uuid")), sa.UniqueConstraint("name", name=op.f("uq_land_type_name")), ) @@ -49,10 +47,7 @@ def upgrade() -> None: nullable=True, ), sa.Column( - "drupal_internal_id", - sa.String(length=50), - autoincrement=False, - nullable=True, + "drupal_id", sa.String(length=50), autoincrement=False, nullable=True ), sa.Column( "transaction_id", sa.BigInteger(), autoincrement=False, nullable=False diff --git a/src/wuttafarm/db/alembic/versions/cf3f8f46d8bc_add_asset_types.py b/src/wuttafarm/db/alembic/versions/cf3f8f46d8bc_add_asset_types.py index 2a5f570..ed4c344 100644 --- a/src/wuttafarm/db/alembic/versions/cf3f8f46d8bc_add_asset_types.py +++ b/src/wuttafarm/db/alembic/versions/cf3f8f46d8bc_add_asset_types.py @@ -29,11 +29,9 @@ def upgrade() -> None: sa.Column("name", sa.String(length=100), nullable=False), sa.Column("description", sa.String(length=255), nullable=True), sa.Column("farmos_uuid", wuttjamaican.db.util.UUID(), nullable=True), - sa.Column("drupal_internal_id", sa.String(length=50), nullable=True), + sa.Column("drupal_id", sa.String(length=50), nullable=True), sa.PrimaryKeyConstraint("uuid", name=op.f("pk_asset_type")), - sa.UniqueConstraint( - "drupal_internal_id", name=op.f("uq_asset_type_drupal_internal_id") - ), + sa.UniqueConstraint("drupal_id", name=op.f("uq_asset_type_drupal_id")), sa.UniqueConstraint("farmos_uuid", name=op.f("uq_asset_type_farmos_uuid")), sa.UniqueConstraint("name", name=op.f("uq_asset_type_name")), ) @@ -53,10 +51,7 @@ def upgrade() -> None: nullable=True, ), sa.Column( - "drupal_internal_id", - sa.String(length=50), - autoincrement=False, - nullable=True, + "drupal_id", sa.String(length=50), autoincrement=False, nullable=True ), sa.Column( "transaction_id", sa.BigInteger(), autoincrement=False, nullable=False diff --git a/src/wuttafarm/db/alembic/versions/d7479d7161a8_add_structure_types.py b/src/wuttafarm/db/alembic/versions/d7479d7161a8_add_structure_types.py index 9dce53b..b71c4a6 100644 --- a/src/wuttafarm/db/alembic/versions/d7479d7161a8_add_structure_types.py +++ b/src/wuttafarm/db/alembic/versions/d7479d7161a8_add_structure_types.py @@ -28,11 +28,9 @@ def upgrade() -> None: sa.Column("uuid", wuttjamaican.db.util.UUID(), nullable=False), sa.Column("name", sa.String(length=100), nullable=False), sa.Column("farmos_uuid", wuttjamaican.db.util.UUID(), nullable=True), - sa.Column("drupal_internal_id", sa.String(length=50), nullable=True), + sa.Column("drupal_id", sa.String(length=50), nullable=True), sa.PrimaryKeyConstraint("uuid", name=op.f("pk_structure_type")), - sa.UniqueConstraint( - "drupal_internal_id", name=op.f("uq_structure_type_drupal_internal_id") - ), + sa.UniqueConstraint("drupal_id", name=op.f("uq_structure_type_drupal_id")), sa.UniqueConstraint("farmos_uuid", name=op.f("uq_structure_type_farmos_uuid")), sa.UniqueConstraint("name", name=op.f("uq_structure_type_name")), ) @@ -49,10 +47,7 @@ def upgrade() -> None: nullable=True, ), sa.Column( - "drupal_internal_id", - sa.String(length=50), - autoincrement=False, - nullable=True, + "drupal_id", sa.String(length=50), autoincrement=False, nullable=True ), sa.Column( "transaction_id", sa.BigInteger(), autoincrement=False, nullable=False diff --git a/src/wuttafarm/db/alembic/versions/e0d9f72575d6_add_log_types.py b/src/wuttafarm/db/alembic/versions/e0d9f72575d6_add_log_types.py index 7180412..862d3be 100644 --- a/src/wuttafarm/db/alembic/versions/e0d9f72575d6_add_log_types.py +++ b/src/wuttafarm/db/alembic/versions/e0d9f72575d6_add_log_types.py @@ -29,11 +29,9 @@ def upgrade() -> None: sa.Column("name", sa.String(length=100), nullable=False), sa.Column("description", sa.String(length=255), nullable=True), sa.Column("farmos_uuid", wuttjamaican.db.util.UUID(), nullable=True), - sa.Column("drupal_internal_id", sa.String(length=50), nullable=True), + sa.Column("drupal_id", sa.String(length=50), nullable=True), sa.PrimaryKeyConstraint("uuid", name=op.f("pk_log_type")), - sa.UniqueConstraint( - "drupal_internal_id", name=op.f("uq_log_type_drupal_internal_id") - ), + sa.UniqueConstraint("drupal_id", name=op.f("uq_log_type_drupal_id")), sa.UniqueConstraint("farmos_uuid", name=op.f("uq_log_type_farmos_uuid")), sa.UniqueConstraint("name", name=op.f("uq_log_type_name")), ) @@ -53,10 +51,7 @@ def upgrade() -> None: nullable=True, ), sa.Column( - "drupal_internal_id", - sa.String(length=50), - autoincrement=False, - nullable=True, + "drupal_id", sa.String(length=50), autoincrement=False, nullable=True ), sa.Column( "transaction_id", sa.BigInteger(), autoincrement=False, nullable=False diff --git a/src/wuttafarm/db/alembic/versions/e416b96467fc_add_land_assets.py b/src/wuttafarm/db/alembic/versions/e416b96467fc_add_land_assets.py index ede9b22..5f7dd87 100644 --- a/src/wuttafarm/db/alembic/versions/e416b96467fc_add_land_assets.py +++ b/src/wuttafarm/db/alembic/versions/e416b96467fc_add_land_assets.py @@ -33,16 +33,14 @@ def upgrade() -> None: sa.Column("notes", sa.Text(), nullable=True), sa.Column("active", sa.Boolean(), nullable=False), sa.Column("farmos_uuid", wuttjamaican.db.util.UUID(), nullable=True), - sa.Column("drupal_internal_id", sa.Integer(), nullable=True), + sa.Column("drupal_id", sa.Integer(), nullable=True), sa.ForeignKeyConstraint( ["land_type_uuid"], ["land_type.uuid"], name=op.f("fk_land_asset_land_type_uuid_land_type"), ), sa.PrimaryKeyConstraint("uuid", name=op.f("pk_land_asset")), - sa.UniqueConstraint( - "drupal_internal_id", name=op.f("uq_land_asset_drupal_internal_id") - ), + sa.UniqueConstraint("drupal_id", name=op.f("uq_land_asset_drupal_id")), sa.UniqueConstraint("farmos_uuid", name=op.f("uq_land_asset_farmos_uuid")), sa.UniqueConstraint( "land_type_uuid", name=op.f("uq_land_asset_land_type_uuid") @@ -71,9 +69,7 @@ def upgrade() -> None: autoincrement=False, nullable=True, ), - sa.Column( - "drupal_internal_id", sa.Integer(), autoincrement=False, nullable=True - ), + sa.Column("drupal_id", sa.Integer(), autoincrement=False, nullable=True), sa.Column( "transaction_id", sa.BigInteger(), autoincrement=False, nullable=False ), diff --git a/src/wuttafarm/db/model/animals.py b/src/wuttafarm/db/model/animals.py index 0eb6c0b..e23f0c5 100644 --- a/src/wuttafarm/db/model/animals.py +++ b/src/wuttafarm/db/model/animals.py @@ -81,7 +81,7 @@ class AnimalType(model.Base): """, ) - drupal_internal_id = sa.Column( + drupal_id = sa.Column( sa.Integer(), nullable=True, unique=True, @@ -181,7 +181,7 @@ class Animal(model.Base): """, ) - drupal_internal_id = sa.Column( + drupal_id = sa.Column( sa.Integer(), nullable=True, unique=True, diff --git a/src/wuttafarm/db/model/assets.py b/src/wuttafarm/db/model/assets.py index d726632..581be62 100644 --- a/src/wuttafarm/db/model/assets.py +++ b/src/wuttafarm/db/model/assets.py @@ -69,7 +69,7 @@ class AssetType(model.Base): """, ) - drupal_internal_id = sa.Column( + drupal_id = sa.Column( sa.String(length=50), nullable=True, unique=True, diff --git a/src/wuttafarm/db/model/groups.py b/src/wuttafarm/db/model/groups.py index 3bcac19..eae034f 100644 --- a/src/wuttafarm/db/model/groups.py +++ b/src/wuttafarm/db/model/groups.py @@ -93,7 +93,7 @@ class Group(model.Base): """, ) - drupal_internal_id = sa.Column( + drupal_id = sa.Column( sa.Integer(), nullable=True, unique=True, diff --git a/src/wuttafarm/db/model/land.py b/src/wuttafarm/db/model/land.py index ca18d70..53c93cf 100644 --- a/src/wuttafarm/db/model/land.py +++ b/src/wuttafarm/db/model/land.py @@ -61,7 +61,7 @@ class LandType(model.Base): """, ) - drupal_internal_id = sa.Column( + drupal_id = sa.Column( sa.String(length=50), nullable=True, unique=True, @@ -143,7 +143,7 @@ class LandAsset(model.Base): """, ) - drupal_internal_id = sa.Column( + drupal_id = sa.Column( sa.Integer(), nullable=True, unique=True, diff --git a/src/wuttafarm/db/model/logs.py b/src/wuttafarm/db/model/logs.py index 70e3585..b215be5 100644 --- a/src/wuttafarm/db/model/logs.py +++ b/src/wuttafarm/db/model/logs.py @@ -69,7 +69,7 @@ class LogType(model.Base): """, ) - drupal_internal_id = sa.Column( + drupal_id = sa.Column( sa.String(length=50), nullable=True, unique=True, diff --git a/src/wuttafarm/db/model/structures.py b/src/wuttafarm/db/model/structures.py index 412e59a..d9fccdb 100644 --- a/src/wuttafarm/db/model/structures.py +++ b/src/wuttafarm/db/model/structures.py @@ -61,7 +61,7 @@ class StructureType(model.Base): """, ) - drupal_internal_id = sa.Column( + drupal_id = sa.Column( sa.String(length=50), nullable=True, unique=True, @@ -154,7 +154,7 @@ class Structure(model.Base): """, ) - drupal_internal_id = sa.Column( + drupal_id = sa.Column( sa.Integer(), nullable=True, unique=True, diff --git a/src/wuttafarm/db/model/users.py b/src/wuttafarm/db/model/users.py index 2cad429..d194175 100644 --- a/src/wuttafarm/db/model/users.py +++ b/src/wuttafarm/db/model/users.py @@ -64,7 +64,7 @@ class WuttaFarmUser(model.Base): """, ) - drupal_internal_id = sa.Column( + drupal_id = sa.Column( sa.Integer(), nullable=True, doc=""" @@ -77,4 +77,4 @@ class WuttaFarmUser(model.Base): WuttaFarmUser.make_proxy(model.User, "_wuttafarm", "farmos_uuid") -WuttaFarmUser.make_proxy(model.User, "_wuttafarm", "drupal_internal_id") +WuttaFarmUser.make_proxy(model.User, "_wuttafarm", "drupal_id") diff --git a/src/wuttafarm/importing/farmos.py b/src/wuttafarm/importing/farmos.py index 2623eab..68990cb 100644 --- a/src/wuttafarm/importing/farmos.py +++ b/src/wuttafarm/importing/farmos.py @@ -145,7 +145,7 @@ class AnimalImporter(FromFarmOS, ToWutta): supported_fields = [ "farmos_uuid", - "drupal_internal_id", + "drupal_id", "name", "animal_type_uuid", "sex", @@ -208,7 +208,7 @@ class AnimalImporter(FromFarmOS, ToWutta): return { "farmos_uuid": UUID(animal["id"]), - "drupal_internal_id": animal["attributes"]["drupal_internal__id"], + "drupal_id": animal["attributes"]["drupal_internal__id"], "name": animal["attributes"]["name"], "animal_type_uuid": animal_type.uuid, "sex": animal["attributes"]["sex"], @@ -229,7 +229,7 @@ class AnimalTypeImporter(FromFarmOS, ToWutta): supported_fields = [ "farmos_uuid", - "drupal_internal_id", + "drupal_id", "name", "description", "changed", @@ -244,7 +244,7 @@ class AnimalTypeImporter(FromFarmOS, ToWutta): """ """ return { "farmos_uuid": UUID(animal_type["id"]), - "drupal_internal_id": animal_type["attributes"]["drupal_internal__tid"], + "drupal_id": animal_type["attributes"]["drupal_internal__tid"], "name": animal_type["attributes"]["name"], "description": animal_type["attributes"]["description"], "changed": self.normalize_datetime(animal_type["attributes"]["changed"]), @@ -260,7 +260,7 @@ class AssetTypeImporter(FromFarmOS, ToWutta): supported_fields = [ "farmos_uuid", - "drupal_internal_id", + "drupal_id", "name", "description", ] @@ -274,7 +274,7 @@ class AssetTypeImporter(FromFarmOS, ToWutta): """ """ return { "farmos_uuid": UUID(asset_type["id"]), - "drupal_internal_id": asset_type["attributes"]["drupal_internal__id"], + "drupal_id": asset_type["attributes"]["drupal_internal__id"], "name": asset_type["attributes"]["label"], "description": asset_type["attributes"]["description"], } @@ -289,7 +289,7 @@ class GroupImporter(FromFarmOS, ToWutta): supported_fields = [ "farmos_uuid", - "drupal_internal_id", + "drupal_id", "name", "is_location", "is_fixed", @@ -309,7 +309,7 @@ class GroupImporter(FromFarmOS, ToWutta): return { "farmos_uuid": UUID(group["id"]), - "drupal_internal_id": group["attributes"]["drupal_internal__id"], + "drupal_id": group["attributes"]["drupal_internal__id"], "name": group["attributes"]["name"], "is_location": group["attributes"]["is_location"], "is_fixed": group["attributes"]["is_fixed"], @@ -327,7 +327,7 @@ class LandAssetImporter(FromFarmOS, ToWutta): supported_fields = [ "farmos_uuid", - "drupal_internal_id", + "drupal_id", "name", "land_type_uuid", "is_location", @@ -342,7 +342,7 @@ class LandAssetImporter(FromFarmOS, ToWutta): self.land_types_by_id = {} for land_type in self.target_session.query(model.LandType): - self.land_types_by_id[land_type.drupal_internal_id] = land_type + self.land_types_by_id[land_type.drupal_id] = land_type def get_source_objects(self): """ """ @@ -364,7 +364,7 @@ class LandAssetImporter(FromFarmOS, ToWutta): return { "farmos_uuid": UUID(land["id"]), - "drupal_internal_id": land["attributes"]["drupal_internal__id"], + "drupal_id": land["attributes"]["drupal_internal__id"], "name": land["attributes"]["name"], "land_type_uuid": land_type.uuid, "is_location": land["attributes"]["is_location"], @@ -383,7 +383,7 @@ class LandTypeImporter(FromFarmOS, ToWutta): supported_fields = [ "farmos_uuid", - "drupal_internal_id", + "drupal_id", "name", ] @@ -396,7 +396,7 @@ class LandTypeImporter(FromFarmOS, ToWutta): """ """ return { "farmos_uuid": UUID(land_type["id"]), - "drupal_internal_id": land_type["attributes"]["drupal_internal__id"], + "drupal_id": land_type["attributes"]["drupal_internal__id"], "name": land_type["attributes"]["label"], } @@ -410,7 +410,7 @@ class LogTypeImporter(FromFarmOS, ToWutta): supported_fields = [ "farmos_uuid", - "drupal_internal_id", + "drupal_id", "name", "description", ] @@ -424,7 +424,7 @@ class LogTypeImporter(FromFarmOS, ToWutta): """ """ return { "farmos_uuid": UUID(log_type["id"]), - "drupal_internal_id": log_type["attributes"]["drupal_internal__id"], + "drupal_id": log_type["attributes"]["drupal_internal__id"], "name": log_type["attributes"]["label"], "description": log_type["attributes"]["description"], } @@ -439,7 +439,7 @@ class StructureImporter(FromFarmOS, ToWutta): supported_fields = [ "farmos_uuid", - "drupal_internal_id", + "drupal_id", "name", "structure_type_uuid", "is_location", @@ -455,9 +455,7 @@ class StructureImporter(FromFarmOS, ToWutta): self.structure_types_by_id = {} for structure_type in self.target_session.query(model.StructureType): - self.structure_types_by_id[structure_type.drupal_internal_id] = ( - structure_type - ) + self.structure_types_by_id[structure_type.drupal_id] = structure_type def get_source_objects(self): """ """ @@ -493,7 +491,7 @@ class StructureImporter(FromFarmOS, ToWutta): return { "farmos_uuid": UUID(structure["id"]), - "drupal_internal_id": structure["attributes"]["drupal_internal__id"], + "drupal_id": structure["attributes"]["drupal_internal__id"], "name": structure["attributes"]["name"], "structure_type_uuid": structure_type.uuid, "is_location": structure["attributes"]["is_location"], @@ -513,7 +511,7 @@ class StructureTypeImporter(FromFarmOS, ToWutta): supported_fields = [ "farmos_uuid", - "drupal_internal_id", + "drupal_id", "name", ] @@ -526,7 +524,7 @@ class StructureTypeImporter(FromFarmOS, ToWutta): """ """ return { "farmos_uuid": UUID(structure_type["id"]), - "drupal_internal_id": structure_type["attributes"]["drupal_internal__id"], + "drupal_id": structure_type["attributes"]["drupal_internal__id"], "name": structure_type["attributes"]["label"], } @@ -540,7 +538,7 @@ class UserImporter(FromFarmOS, ToWutta): supported_fields = [ "farmos_uuid", - "drupal_internal_id", + "drupal_id", "username", ] @@ -551,7 +549,7 @@ class UserImporter(FromFarmOS, ToWutta): fields.extend( [ "farmos_uuid", - "drupal_internal_id", + "drupal_id", ] ) return fields @@ -565,13 +563,13 @@ class UserImporter(FromFarmOS, ToWutta): """ """ # nb. skip Anonymous user which does not have drupal id - drupal_internal_id = user["attributes"].get("drupal_internal__uid") - if not drupal_internal_id: + drupal_id = user["attributes"].get("drupal_internal__uid") + if not drupal_id: return None return { "farmos_uuid": UUID(user["id"]), - "drupal_internal_id": drupal_internal_id, + "drupal_id": drupal_id, "username": user["attributes"]["name"], } diff --git a/src/wuttafarm/web/views/animal_types.py b/src/wuttafarm/web/views/animal_types.py index 2e10f30..09d1e25 100644 --- a/src/wuttafarm/web/views/animal_types.py +++ b/src/wuttafarm/web/views/animal_types.py @@ -55,7 +55,7 @@ class AnimalTypeView(WuttaFarmMasterView): "description", "changed", "farmos_uuid", - "drupal_internal_id", + "drupal_id", ] has_rows = True @@ -80,9 +80,7 @@ class AnimalTypeView(WuttaFarmMasterView): g.set_link("name") def get_farmos_url(self, animal_type): - return self.app.get_farmos_url( - f"/taxonomy/term/{animal_type.drupal_internal_id}" - ) + return self.app.get_farmos_url(f"/taxonomy/term/{animal_type.drupal_id}") def get_xref_buttons(self, animal_type): buttons = super().get_xref_buttons(animal_type) diff --git a/src/wuttafarm/web/views/animals.py b/src/wuttafarm/web/views/animals.py index 2f5d894..e22095e 100644 --- a/src/wuttafarm/web/views/animals.py +++ b/src/wuttafarm/web/views/animals.py @@ -64,7 +64,7 @@ class AnimalView(WuttaFarmMasterView): "active", "notes", "farmos_uuid", - "drupal_internal_id", + "drupal_id", "image_url", "image", ] @@ -99,7 +99,7 @@ class AnimalView(WuttaFarmMasterView): f.set_default("image", animal.image_url) def get_farmos_url(self, animal): - return self.app.get_farmos_url(f"/asset/{animal.drupal_internal_id}") + return self.app.get_farmos_url(f"/asset/{animal.drupal_id}") def get_xref_buttons(self, animal): buttons = super().get_xref_buttons(animal) diff --git a/src/wuttafarm/web/views/asset_types.py b/src/wuttafarm/web/views/asset_types.py index d23498e..775fa3a 100644 --- a/src/wuttafarm/web/views/asset_types.py +++ b/src/wuttafarm/web/views/asset_types.py @@ -51,7 +51,7 @@ class AssetTypeView(WuttaFarmMasterView): "name", "description", "farmos_uuid", - "drupal_internal_id", + "drupal_id", ] def configure_grid(self, grid): diff --git a/src/wuttafarm/web/views/farmos/animal_types.py b/src/wuttafarm/web/views/farmos/animal_types.py index ae0b0d4..94d02d8 100644 --- a/src/wuttafarm/web/views/farmos/animal_types.py +++ b/src/wuttafarm/web/views/farmos/animal_types.py @@ -96,7 +96,7 @@ class AnimalTypeView(FarmOSMasterView): return { "uuid": animal_type["id"], - "drupal_internal_id": animal_type["attributes"]["drupal_internal__tid"], + "drupal_id": animal_type["attributes"]["drupal_internal__tid"], "name": animal_type["attributes"]["name"], "description": description or colander.null, "changed": changed, @@ -121,7 +121,7 @@ class AnimalTypeView(FarmOSMasterView): "View in farmOS", primary=True, url=self.app.get_farmos_url( - f"/taxonomy/term/{animal_type['drupal_internal_id']}" + f"/taxonomy/term/{animal_type['drupal_id']}" ), target="_blank", icon_left="external-link-alt", diff --git a/src/wuttafarm/web/views/farmos/animals.py b/src/wuttafarm/web/views/farmos/animals.py index 5a1ecd5..760ad34 100644 --- a/src/wuttafarm/web/views/farmos/animals.py +++ b/src/wuttafarm/web/views/farmos/animals.py @@ -175,7 +175,7 @@ class AnimalView(FarmOSMasterView): return { "uuid": animal["id"], - "drupal_internal_id": animal["attributes"]["drupal_internal__id"], + "drupal_id": animal["attributes"]["drupal_internal__id"], "name": animal["attributes"]["name"], "birthdate": birthdate, "sex": animal["attributes"]["sex"], @@ -222,7 +222,7 @@ class AnimalView(FarmOSMasterView): self.make_button( "View in farmOS", primary=True, - url=self.app.get_farmos_url(f"/asset/{animal['drupal_internal_id']}"), + url=self.app.get_farmos_url(f"/asset/{animal['drupal_id']}"), target="_blank", icon_left="external-link-alt", ), diff --git a/src/wuttafarm/web/views/farmos/asset_types.py b/src/wuttafarm/web/views/farmos/asset_types.py index d033ae6..a2fac2f 100644 --- a/src/wuttafarm/web/views/farmos/asset_types.py +++ b/src/wuttafarm/web/views/farmos/asset_types.py @@ -78,7 +78,7 @@ class AssetTypeView(FarmOSMasterView): def normalize_asset_type(self, asset_type): return { "uuid": asset_type["id"], - "drupal_internal_id": asset_type["attributes"]["drupal_internal__id"], + "drupal_id": asset_type["attributes"]["drupal_internal__id"], "label": asset_type["attributes"]["label"], "description": asset_type["attributes"]["description"], } diff --git a/src/wuttafarm/web/views/farmos/groups.py b/src/wuttafarm/web/views/farmos/groups.py index b41a987..66224fe 100644 --- a/src/wuttafarm/web/views/farmos/groups.py +++ b/src/wuttafarm/web/views/farmos/groups.py @@ -109,7 +109,7 @@ class GroupView(FarmOSMasterView): return { "uuid": group["id"], - "drupal_internal_id": group["attributes"]["drupal_internal__id"], + "drupal_id": group["attributes"]["drupal_internal__id"], "name": group["attributes"]["name"], "created": created, "changed": changed, @@ -148,7 +148,7 @@ class GroupView(FarmOSMasterView): self.make_button( "View in farmOS", primary=True, - url=self.app.get_farmos_url(f"/asset/{group['drupal_internal_id']}"), + url=self.app.get_farmos_url(f"/asset/{group['drupal_id']}"), target="_blank", icon_left="external-link-alt", ), diff --git a/src/wuttafarm/web/views/farmos/land_assets.py b/src/wuttafarm/web/views/farmos/land_assets.py index 185c9d0..64f43cc 100644 --- a/src/wuttafarm/web/views/farmos/land_assets.py +++ b/src/wuttafarm/web/views/farmos/land_assets.py @@ -118,7 +118,7 @@ class LandAssetView(FarmOSMasterView): return { "uuid": land["id"], - "drupal_internal_id": land["attributes"]["drupal_internal__id"], + "drupal_id": land["attributes"]["drupal_internal__id"], "name": land["attributes"]["name"], "land_type": land["attributes"]["land_type"], "created": created, @@ -155,7 +155,7 @@ class LandAssetView(FarmOSMasterView): self.make_button( "View in farmOS", primary=True, - url=self.app.get_farmos_url(f"/asset/{land['drupal_internal_id']}"), + url=self.app.get_farmos_url(f"/asset/{land['drupal_id']}"), target="_blank", icon_left="external-link-alt", ), @@ -169,7 +169,7 @@ class LandAssetView(FarmOSMasterView): self.make_button( "View in farmOS", primary=True, - url=self.app.get_farmos_url(f"/asset/{land['drupal_internal_id']}"), + url=self.app.get_farmos_url(f"/asset/{land['drupal_id']}"), target="_blank", icon_left="external-link-alt", ), diff --git a/src/wuttafarm/web/views/farmos/land_types.py b/src/wuttafarm/web/views/farmos/land_types.py index 9a7bb8b..e9eccea 100644 --- a/src/wuttafarm/web/views/farmos/land_types.py +++ b/src/wuttafarm/web/views/farmos/land_types.py @@ -73,7 +73,7 @@ class LandTypeView(FarmOSMasterView): def normalize_land_type(self, land_type): return { "uuid": land_type["id"], - "drupal_internal_id": land_type["attributes"]["drupal_internal__id"], + "drupal_id": land_type["attributes"]["drupal_internal__id"], "label": land_type["attributes"]["label"], } diff --git a/src/wuttafarm/web/views/farmos/log_types.py b/src/wuttafarm/web/views/farmos/log_types.py index db96fd0..1f6404a 100644 --- a/src/wuttafarm/web/views/farmos/log_types.py +++ b/src/wuttafarm/web/views/farmos/log_types.py @@ -75,7 +75,7 @@ class LogTypeView(FarmOSMasterView): def normalize_log_type(self, log_type): return { "uuid": log_type["id"], - "drupal_internal_id": log_type["attributes"]["drupal_internal__id"], + "drupal_id": log_type["attributes"]["drupal_internal__id"], "label": log_type["attributes"]["label"], "description": log_type["attributes"]["description"], } diff --git a/src/wuttafarm/web/views/farmos/logs_activity.py b/src/wuttafarm/web/views/farmos/logs_activity.py index 33448ab..6bba9cc 100644 --- a/src/wuttafarm/web/views/farmos/logs_activity.py +++ b/src/wuttafarm/web/views/farmos/logs_activity.py @@ -96,7 +96,7 @@ class ActivityLogView(FarmOSMasterView): return { "uuid": log["id"], - "drupal_internal_id": log["attributes"]["drupal_internal__id"], + "drupal_id": log["attributes"]["drupal_internal__id"], "name": log["attributes"]["name"], "timestamp": timestamp, "status": log["attributes"]["status"], @@ -119,7 +119,7 @@ class ActivityLogView(FarmOSMasterView): self.make_button( "View in farmOS", primary=True, - url=self.app.get_farmos_url(f"/log/{log['drupal_internal_id']}"), + url=self.app.get_farmos_url(f"/log/{log['drupal_id']}"), target="_blank", icon_left="external-link-alt", ), diff --git a/src/wuttafarm/web/views/farmos/structure_types.py b/src/wuttafarm/web/views/farmos/structure_types.py index b41e2a3..b7e58d8 100644 --- a/src/wuttafarm/web/views/farmos/structure_types.py +++ b/src/wuttafarm/web/views/farmos/structure_types.py @@ -75,7 +75,7 @@ class StructureTypeView(FarmOSMasterView): def normalize_structure_type(self, structure_type): return { "uuid": structure_type["id"], - "drupal_internal_id": structure_type["attributes"]["drupal_internal__id"], + "drupal_id": structure_type["attributes"]["drupal_internal__id"], "label": structure_type["attributes"]["label"], } diff --git a/src/wuttafarm/web/views/farmos/structures.py b/src/wuttafarm/web/views/farmos/structures.py index f1d23e7..3626fb1 100644 --- a/src/wuttafarm/web/views/farmos/structures.py +++ b/src/wuttafarm/web/views/farmos/structures.py @@ -147,7 +147,7 @@ class StructureView(FarmOSMasterView): return { "uuid": structure["id"], - "drupal_internal_id": structure["attributes"]["drupal_internal__id"], + "drupal_id": structure["attributes"]["drupal_internal__id"], "name": structure["attributes"]["name"], "structure_type": structure["attributes"]["structure_type"], "is_fixed": structure["attributes"]["is_fixed"], @@ -193,9 +193,7 @@ class StructureView(FarmOSMasterView): self.make_button( "View in farmOS", primary=True, - url=self.app.get_farmos_url( - f"/asset/{structure['drupal_internal_id']}" - ), + url=self.app.get_farmos_url(f"/asset/{structure['drupal_id']}"), target="_blank", icon_left="external-link-alt", ), diff --git a/src/wuttafarm/web/views/farmos/users.py b/src/wuttafarm/web/views/farmos/users.py index bb93066..bb004ee 100644 --- a/src/wuttafarm/web/views/farmos/users.py +++ b/src/wuttafarm/web/views/farmos/users.py @@ -95,7 +95,7 @@ class UserView(FarmOSMasterView): return { "uuid": user["id"], - "drupal_internal_id": user["attributes"].get("drupal_internal__uid"), + "drupal_id": user["attributes"].get("drupal_internal__uid"), "display_name": user["attributes"]["display_name"], "name": user["attributes"].get("name") or colander.null, "mail": user["attributes"].get("mail") or colander.null, @@ -120,7 +120,7 @@ class UserView(FarmOSMasterView): session = self.Session() buttons = [] - if drupal_id := user["drupal_internal_id"]: + if drupal_id := user["drupal_id"]: buttons.append( self.make_button( "View in farmOS", diff --git a/src/wuttafarm/web/views/groups.py b/src/wuttafarm/web/views/groups.py index 5c7fee9..5f2746b 100644 --- a/src/wuttafarm/web/views/groups.py +++ b/src/wuttafarm/web/views/groups.py @@ -58,7 +58,7 @@ class GroupView(WuttaFarmMasterView): "active", "notes", "farmos_uuid", - "drupal_internal_id", + "drupal_id", ] def configure_grid(self, grid): @@ -76,7 +76,7 @@ class GroupView(WuttaFarmMasterView): f.set_widget("notes", "notes") def get_farmos_url(self, group): - return self.app.get_farmos_url(f"/asset/{group.drupal_internal_id}") + return self.app.get_farmos_url(f"/asset/{group.drupal_id}") def get_xref_buttons(self, group): buttons = super().get_xref_buttons(group) diff --git a/src/wuttafarm/web/views/land_assets.py b/src/wuttafarm/web/views/land_assets.py index d1025eb..18f7a3d 100644 --- a/src/wuttafarm/web/views/land_assets.py +++ b/src/wuttafarm/web/views/land_assets.py @@ -62,7 +62,7 @@ class LandAssetView(WuttaFarmMasterView): "notes", "active", "farmos_uuid", - "drupal_internal_id", + "drupal_id", ] def configure_grid(self, grid): @@ -86,7 +86,7 @@ class LandAssetView(WuttaFarmMasterView): f.set_node("land_type", LandTypeRef(self.request)) def get_farmos_url(self, land): - return self.app.get_farmos_url(f"/asset/{land.drupal_internal_id}") + return self.app.get_farmos_url(f"/asset/{land.drupal_id}") def get_xref_buttons(self, land_asset): buttons = super().get_xref_buttons(land_asset) diff --git a/src/wuttafarm/web/views/land_types.py b/src/wuttafarm/web/views/land_types.py index 05a0644..21bfabc 100644 --- a/src/wuttafarm/web/views/land_types.py +++ b/src/wuttafarm/web/views/land_types.py @@ -49,7 +49,7 @@ class LandTypeView(WuttaFarmMasterView): form_fields = [ "name", "farmos_uuid", - "drupal_internal_id", + "drupal_id", ] has_rows = True diff --git a/src/wuttafarm/web/views/log_types.py b/src/wuttafarm/web/views/log_types.py index 5c4a8ca..13ea35f 100644 --- a/src/wuttafarm/web/views/log_types.py +++ b/src/wuttafarm/web/views/log_types.py @@ -51,7 +51,7 @@ class LogTypeView(WuttaFarmMasterView): "name", "description", "farmos_uuid", - "drupal_internal_id", + "drupal_id", ] def configure_grid(self, grid): diff --git a/src/wuttafarm/web/views/master.py b/src/wuttafarm/web/views/master.py index 5538989..7ff165b 100644 --- a/src/wuttafarm/web/views/master.py +++ b/src/wuttafarm/web/views/master.py @@ -35,13 +35,13 @@ class WuttaFarmMasterView(MasterView): labels = { "farmos_uuid": "farmOS UUID", - "drupal_internal_id": "Drupal Internal ID", + "drupal_id": "Drupal ID", "image_url": "Image URL", } row_labels = { "farmos_uuid": "farmOS UUID", - "drupal_internal_id": "Drupal Internal ID", + "drupal_id": "Drupal ID", "image_url": "Image URL", } diff --git a/src/wuttafarm/web/views/structure_types.py b/src/wuttafarm/web/views/structure_types.py index c5ca542..ca85fb9 100644 --- a/src/wuttafarm/web/views/structure_types.py +++ b/src/wuttafarm/web/views/structure_types.py @@ -49,7 +49,7 @@ class StructureTypeView(WuttaFarmMasterView): form_fields = [ "name", "farmos_uuid", - "drupal_internal_id", + "drupal_id", ] has_rows = True diff --git a/src/wuttafarm/web/views/structures.py b/src/wuttafarm/web/views/structures.py index 1b0df40..df58fda 100644 --- a/src/wuttafarm/web/views/structures.py +++ b/src/wuttafarm/web/views/structures.py @@ -62,7 +62,7 @@ class StructureView(WuttaFarmMasterView): "notes", "active", "farmos_uuid", - "drupal_internal_id", + "drupal_id", "image_url", "image", ] @@ -96,7 +96,7 @@ class StructureView(WuttaFarmMasterView): f.set_default("image", structure.image_url) def get_farmos_url(self, structure): - return self.app.get_farmos_url(f"/asset/{structure.drupal_internal_id}") + return self.app.get_farmos_url(f"/asset/{structure.drupal_id}") def get_xref_buttons(self, structure): buttons = super().get_xref_buttons(structure) diff --git a/src/wuttafarm/web/views/users.py b/src/wuttafarm/web/views/users.py index 782ab16..2a51399 100644 --- a/src/wuttafarm/web/views/users.py +++ b/src/wuttafarm/web/views/users.py @@ -33,7 +33,7 @@ class UserView(base.UserView): labels = { "farmos_uuid": "farmOS UUID", - "drupal_internal_id": "Drupal Internal ID", + "drupal_id": "Drupal ID", } def get_template_context(self, context): @@ -54,19 +54,19 @@ class UserView(base.UserView): f.fields.append("farmos_uuid") f.set_default("farmos_uuid", user.farmos_uuid) - # drupal_internal_id - f.fields.append("drupal_internal_id") - f.set_default("drupal_internal_id", user.drupal_internal_id) + # drupal_id + f.fields.append("drupal_id") + f.set_default("drupal_id", user.drupal_id) def get_xref_buttons(self, user): buttons = [] - if user.drupal_internal_id: + if user.drupal_id: buttons.append( self.make_button( "View in farmOS", primary=True, - url=self.app.get_farmos_url(f"/user/{user.drupal_internal_id}"), + url=self.app.get_farmos_url(f"/user/{user.drupal_id}"), target="_blank", icon_left="external-link-alt", )