← Back to team overview

sts-sponsors team mailing list archive

Re: [Merge] ~thorsten-merten/maas-site-manager:MAASENG-1290-extend-models-and-views into maas-site-manager:main

 


Diff comments:

> diff --git a/msm/db/_tables.py b/msm/db/_tables.py
> index 3d8a2d7..a69f1c7 100644
> --- a/msm/db/_tables.py
> +++ b/msm/db/_tables.py
> @@ -15,17 +18,43 @@ METADATA = MetaData()
>  Site = Table(
>      "site",
>      METADATA,
> +    Column("alias", String(250), unique=True),
> +    Column("city", String(250)),
>      Column("id", Integer, primary_key=True, index=True),
> -    Column("name", Text, nullable=False, unique=True),
>      Column("last_checkin", DateTime),
> +    # Decimal(8/6)/(9/6) = 16cm precision
> +    Column("latitude", DECIMAL(precision=8, scale=6)),
> +    Column("longitude", DECIMAL(precision=9, scale=6)),

Excellent question: They have different ranges, -90 to 90 needs one number less than -180 to 180. See https://docs.mapbox.com/help/glossary/lat-lon/

> +    Column("name", String(250)),
> +    Column("note", Text),
> +    Column("region", String(250)),
> +    Column("street", String(250)),
> +    Column("timezone", String(3)),
> +    Column("url", String(2048)),
>  )
>  
> +
>  Token = Table(
>      "token",
>      METADATA,
>      Column("id", Integer, primary_key=True, index=True),
> +    Column("site_id", Integer, ForeignKey("site.id"), index=True),
>      Column(
>          "value", UUID(as_uuid=True), nullable=False, index=True, default=uuid4
>      ),
>      Column("expiration", DateTime, nullable=False),
>  )
> +
> +SiteData = Table(
> +    "site_data",
> +    METADATA,
> +    Column("id", Integer, primary_key=True, index=True),
> +    Column(
> +        "site_id", Integer, ForeignKey("site.id"), index=True, nullable=False
> +    ),
> +    Column("total_machines", Integer),
> +    Column("occupied_machines", Integer),
> +    Column("ready_machines", Integer),
> +    Column("error_machines", Integer),
> +    Column("last_seen", DateTime),
> +)


-- 
https://code.launchpad.net/~thorsten-merten/maas-site-manager/+git/maas-site-manager/+merge/437801
Your team MAAS Committers is requested to review the proposed merge of ~thorsten-merten/maas-site-manager:MAASENG-1290-extend-models-and-views into maas-site-manager:main.



References