Merge branch 'improvement/remove-leading-zeroes' of github.com:DiamondLightSource/scaup-backend into improvement/remove-leading-zeroes

Author: gfrn

CHANGELOG.rst

@@ -8,7 +8,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 +++++++++
-v0.18.2 (09/01/2025)
+v0.19.0 (16/01/2026)
++++++++++
+
+**Changed**
+
+- All grids are now displayed in PDF reports, even if they don't have a cassette slot assigned
+
+**Added**
+
+- Perform manufacturer serial number check when creating dewars
+- Add endpoint for creating inventory dewar
+
++++++++++
+v0.18.2 (09/01/2026)
 +++++++++
 
 **Changed**

alembic/versions/31b603858335_increase_name_character_limit.py

@@ -0,0 +1,60 @@
+"""Increase name character limit
+
+Revision ID: 31b603858335
+Revises: 730f6f07da68
+Create Date: 2026-01-23 14:09:57.262059
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '31b603858335'
+down_revision: Union[str, None] = '730f6f07da68'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('Container', 'name',
+               existing_type=sa.VARCHAR(length=40),
+               type_=sa.String(length=80),
+               existing_nullable=False)
+    op.alter_column('Sample', 'name',
+               existing_type=sa.VARCHAR(length=40),
+               type_=sa.String(length=80),
+               existing_nullable=False)
+    op.alter_column('Shipment', 'name',
+               existing_type=sa.VARCHAR(length=40),
+               type_=sa.String(length=80),
+               existing_nullable=False)
+    op.alter_column('TopLevelContainer', 'name',
+               existing_type=sa.VARCHAR(length=40),
+               type_=sa.String(length=80),
+               existing_nullable=False)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('TopLevelContainer', 'name',
+               existing_type=sa.String(length=80),
+               type_=sa.VARCHAR(length=40),
+               existing_nullable=False)
+    op.alter_column('Shipment', 'name',
+               existing_type=sa.String(length=80),
+               type_=sa.VARCHAR(length=40),
+               existing_nullable=False)
+    op.alter_column('Sample', 'name',
+               existing_type=sa.String(length=80),
+               type_=sa.VARCHAR(length=40),
+               existing_nullable=False)
+    op.alter_column('Container', 'name',
+               existing_type=sa.String(length=80),
+               type_=sa.VARCHAR(length=40),
+               existing_nullable=False)
+    # ### end Alembic commands ###

database/data.sql

@@ -2,8 +2,10 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 17.5
--- Dumped by pg_dump version 17.4
+\restrict U6bOmzaZYjYIO0Hg2gWsqgE5LjK1vVHNNCtv3caSVlfRNEoi3Gvy4hpNaeUfHGq
+
+-- Dumped from database version 17.6 (Debian 17.6-2.pgdg13+1)
+-- Dumped by pg_dump version 18.0
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -45,7 +47,7 @@ CREATE TABLE public."Container" (
     details json,
     "requestedReturn" boolean NOT NULL,
     "registeredContainer" character varying,
-    name character varying(40) NOT NULL,
+    name character varying(80) NOT NULL,
     "externalId" integer,
     comments character varying(255),
     "isInternal" boolean NOT NULL,
@@ -161,7 +163,7 @@ CREATE TABLE public."Sample" (
     location smallint,
     details json,
     "containerId" integer,
-    name character varying(40) NOT NULL,
+    name character varying(80) NOT NULL,
     "externalId" integer,
     comments character varying(255),
     "subLocation" smallint,
@@ -250,7 +252,7 @@ CREATE TABLE public."Shipment" (
     "creationDate" timestamp with time zone DEFAULT now() NOT NULL,
     "shipmentRequest" integer,
     status character varying(25) DEFAULT 'Created'::character varying,
-    name character varying(40) NOT NULL,
+    name character varying(80) NOT NULL,
     "externalId" integer,
     comments character varying(255),
     "proposalCode" character varying(2) NOT NULL,
@@ -301,7 +303,7 @@ CREATE TABLE public."TopLevelContainer" (
     details json,
     code character varying(20) NOT NULL,
     type character varying(40) DEFAULT 'dewar'::character varying NOT NULL,
-    name character varying(40) NOT NULL,
+    name character varying(80) NOT NULL,
     "externalId" integer,
     comments character varying(255),
     "isInternal" boolean NOT NULL,
@@ -498,7 +500,7 @@ COPY public."TopLevelContainer" ("topLevelContainerId", "shipmentId", details, c
 --
 
 COPY public.alembic_version (version_num) FROM stdin;
-730f6f07da68
+31b603858335
 \.
 
 
@@ -861,3 +863,5 @@ GRANT ALL ON SCHEMA public TO PUBLIC;
 -- PostgreSQL database dump complete
 --
 
+\unrestrict U6bOmzaZYjYIO0Hg2gWsqgE5LjK1vVHNNCtv3caSVlfRNEoi3Gvy4hpNaeUfHGq
+

src/scaup/models/inner_db/tables.py

@@ -22,7 +22,7 @@ class Base(DeclarativeBase):
 
 
 class BaseColumns:
-    name: Mapped[str] = mapped_column(String(40))
+    name: Mapped[str] = mapped_column(String(80))
     externalId: Mapped[int | None] = mapped_column(unique=True, comment="Item ID in ISPyB")
     comments: Mapped[str | None] = mapped_column(String(255))
     creationDate: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now())