Skip to content

Commit 27cd161

Browse files
committed
Merge branch 'develop' of github.com:ukaea/ukaea-metadata into repo-cleanup-refactor
2 parents dc6d484 + d17ef31 commit 27cd161

2 files changed

Lines changed: 162 additions & 0 deletions

File tree

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
"labLocation": "MRF",
3+
"seid": "0001",
4+
"jobId": "23001",
5+
"sessionId": "1",
6+
"sampleId": "S-0001370",
7+
"bookingStart": "2024-07-31T07:30:00Z",
8+
"bookingEnd": "2024-07-31T17:30:00Z",
9+
"internalUser": {
10+
"firstName": "John",
11+
"lastName": "Doe"
12+
},
13+
"externalUser": {
14+
"firstName": "Jay",
15+
"lastName": "Doe"
16+
},
17+
"institution": "University of Oxford",
18+
"scientificSupport": {
19+
"firstName": "Jane",
20+
"lastName": "Doe"
21+
},
22+
"notes": "Leak on water line",
23+
"workCategory": "User",
24+
"sampleSplit": true,
25+
"splitSamepleId": "S-0001711",
26+
"tritium": false,
27+
"beryllium": false,
28+
"betaGamma": true
29+
}
Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
{
2+
"$id": "urn:ukaea:facility:mrf:diagnostic",
3+
"$schema": "https://json-schema.org/draft/2020-12/schema",
4+
"description": "Metadata schema MRF experiments",
5+
"type": "object",
6+
"required": [
7+
"seid",
8+
"bookingStart",
9+
"bookingEnd",
10+
"workCategory",
11+
"sampleSplit",
12+
"tritium",
13+
"beryllium",
14+
"betaGamma"
15+
],
16+
"properties": {
17+
"labLocation": {
18+
"type": "string",
19+
"default": "MRF"
20+
},
21+
"seid": {
22+
"type": "string",
23+
"pattern": "^\\d{4}$"
24+
},
25+
"jobId": {
26+
"type": "string",
27+
"pattern": "^\\d{5}$",
28+
"$comment": "First 2 digits represent year, last 3 digits represent incremental number"
29+
},
30+
"sessionId": {
31+
"type": "string",
32+
"$comment": "Incremental session ID across a single job, not yet implemented in Booking System"
33+
},
34+
"sampleId": {
35+
"type": "string",
36+
"$comment": "Unique identifier for the sample, not part of Salesforce MVP"
37+
},
38+
"bookingStart": {
39+
"type": "string",
40+
"format": "date-time"
41+
},
42+
"bookingEnd": {
43+
"type": "string",
44+
"format": "date-time"
45+
},
46+
"internalUser": {
47+
"type": "object",
48+
"properties": {
49+
"firstName": {
50+
"type": "string"
51+
},
52+
"lastName": {
53+
"type": "string"
54+
},
55+
"email": {
56+
"type": "string"
57+
}
58+
}
59+
},
60+
"externalUser": {
61+
"type": "object",
62+
"properties": {
63+
"firstName": {
64+
"type": "string"
65+
},
66+
"lastName": {
67+
"type": "string"
68+
},
69+
"email": {
70+
"type": "string"
71+
}
72+
},
73+
"$comment": "Would lead to an institution"
74+
},
75+
"institution": {
76+
"type": "string"
77+
},
78+
"scientificSupport": {
79+
"type": "object",
80+
"properties": {
81+
"firstName": {
82+
"type": "string"
83+
},
84+
"lastName": {
85+
"type": "string"
86+
},
87+
"email": {
88+
"type": "string"
89+
}
90+
}
91+
},
92+
"notes": {
93+
"type": "string"
94+
},
95+
"workCategory": {
96+
"enum": [
97+
"User",
98+
"Engineering",
99+
"Mainenance",
100+
"Environment",
101+
"Repair"
102+
]
103+
},
104+
"sampleSplit": {
105+
"type": "boolean"
106+
},
107+
"splitSampleId": {
108+
"type": "string"
109+
},
110+
"tritium": {
111+
"type": "boolean"
112+
},
113+
"beryllium": {
114+
"type": "boolean"
115+
},
116+
"betaGamma": {
117+
"type": "boolean"
118+
}
119+
},
120+
"if": {
121+
"properties": {
122+
"workCategory": {
123+
"const": "User"
124+
}
125+
}
126+
},
127+
"then": {
128+
"required": ["jobId"]
129+
},
130+
"dependentRequired": {
131+
"externalUser": ["institution"]
132+
}
133+
}

0 commit comments

Comments
 (0)