Merge pull request #24 from stuartcampbell/proposal-directory-skeleton

Add beamline and cycle to list of directory fields
NSLS2 · Feb 1, 2024 · 5ec6da5 · 5ec6da5
2 parents dcbf445 + 428f35a
commit 5ec6da5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/nsls2api/api/models/proposal_model.py b/src/nsls2api/api/models/proposal_model.py
@@ -56,8 +56,10 @@ class ProposalUser(pydantic.BaseModel):
 class ProposalDirectories(pydantic.BaseModel):
     path: str
     owner: str
-    group: str | None = ""
+    group: str | None = None
     group_writable: bool | None = False
+    beamline: str | None = None
+    cycle: str | None = None
     users: list[dict[str, str]]
     groups: list[dict[str, str]]
 

diff --git a/src/nsls2api/services/proposal_service.py b/src/nsls2api/services/proposal_service.py
@@ -310,6 +310,8 @@ async def directories(proposal_id: int):
                 "path": str(
                     data_root / "proposals" / str(cycle) / proposal.data_session
                 ),
+                "beamline": beamline.upper(),
+                "cycle": str(cycle),
                 "owner": "nsls2data",
                 "group": proposal.data_session,
                 "group_writable": True,