Skip to content

Commit 9a3ca5a

Browse files
authored
chore: add new material types (#1980)
## 🔧 Problem Add the material types specified in #1965
1 parent e724540 commit 9a3ca5a

File tree

2 files changed

+195
-14
lines changed

2 files changed

+195
-14
lines changed

backend/src/app/domain/processes/schemas.py

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,32 @@ class Category(StrEnum):
2222
EOL = "end-of-life"
2323
INGREDIENT = "ingredient"
2424
MATERIAL = "material"
25-
MATERIAL_TYPE_METAL = "material_type:metal"
25+
26+
MATERIAL_TYPE_ALUMINIUM = "material_type:aluminium"
27+
MATERIAL_TYPE_BATTERY_CELL = "material_type:battery_cell"
28+
MATERIAL_TYPE_COMPOSITES = "material_type:composites"
29+
MATERIAL_TYPE_CONTAINERBOARD = "material_type:containerboard"
30+
MATERIAL_TYPE_COPPER = "material_type:copper"
31+
MATERIAL_TYPE_FERROUS_METAL = "material_type:ferrous_metals"
32+
MATERIAL_TYPE_GLASS = "material_type:glass"
33+
MATERIAL_TYPE_HDPE = "material_type:hdpe"
34+
MATERIAL_TYPE_LDPE = "material_type:ldpe"
2635
MATERIAL_TYPE_ORGANIC_FIBERS = "material_type:organic_fibers"
27-
MATERIAL_TYPE_OTHER = "material_type:other"
36+
MATERIAL_TYPE_PET = "material_type:pet"
37+
MATERIAL_TYPE_PP = "material_type:pp"
38+
MATERIAL_TYPE_PUR_FOAM = "material_type:pur_foam"
39+
MATERIAL_TYPE_PWB = "material_type:pwb"
40+
MATERIAL_TYPE_RIGID_PLASTICS = "material_type:rigid_plastics"
41+
MATERIAL_TYPE_RUBBER = "material_type:rubber"
2842
MATERIAL_TYPE_SYNTHETIC_FIBERS = "material_type:synthetic_fibers"
43+
MATERIAL_TYPE_WOOD = "material_type:wood"
44+
45+
# Obsolete material_types
46+
MATERIAL_TYPE_METAL = "material_type:metal"
47+
MATERIAL_TYPE_OTHER = "material_type:other"
2948
MATERIAL_TYPE_PLASTIC = "material_type:plastic"
3049
MATERIAL_TYPE_UPHOLSTERY = "material_type:upholstery"
31-
MATERIAL_TYPE_WOOD = "material_type:wood"
50+
3251
PACKAGING = "packaging"
3352
PACKAGING_TYPE_BAG = "packaging_type:bag"
3453
PACKAGING_TYPE_BOTTLE = "packaging_type:bottle"

src/Data/Process/Category.elm

Lines changed: 173 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,27 @@ type Category
3333

3434

3535
type Material
36-
= Metal
36+
= Aluminium
37+
| BatteryCell
38+
| Composites
39+
| Containerboard
40+
| Copper
41+
| FerrousMetal
42+
| Glass
43+
| HDPE
44+
| LDPE
45+
| Metal -- obsolete materials
3746
| OrganicFibers
38-
| OtherMaterial
39-
| Plastic
47+
| OtherMaterial -- obsolete materials
48+
| PET
49+
| PP
50+
| PWB
51+
| Plastic -- obsolete materials
52+
| PurFoam
53+
| RigidPlastics
54+
| Rubber
4055
| SyntheticFibers
41-
| Upholstery
56+
| Upholstery -- obsolete materials
4257
| Wood
4358

4459

@@ -134,24 +149,73 @@ fromString string =
134149
materialTypeFromString : String -> Result String Material
135150
materialTypeFromString string =
136151
case string of
137-
"metal" ->
138-
Ok Metal
152+
"aluminium" ->
153+
Ok Aluminium
154+
155+
"battery_cell" ->
156+
Ok BatteryCell
157+
158+
"composites" ->
159+
Ok Composites
160+
161+
"containerboard" ->
162+
Ok Containerboard
163+
164+
"copper" ->
165+
Ok Copper
166+
167+
"ferrous_metals" ->
168+
Ok FerrousMetal
169+
170+
"glass" ->
171+
Ok Glass
172+
173+
"hdpe" ->
174+
Ok HDPE
175+
176+
"ldpe" ->
177+
Ok LDPE
139178

140179
"organic_fibers" ->
141180
Ok OrganicFibers
142181

143-
"plastic" ->
144-
Ok Plastic
182+
"pet" ->
183+
Ok PET
184+
185+
"pp" ->
186+
Ok PP
187+
188+
"pur_foam" ->
189+
Ok PurFoam
190+
191+
"pwb" ->
192+
Ok PWB
193+
194+
"rigid_plastics" ->
195+
Ok RigidPlastics
196+
197+
"rubber" ->
198+
Ok Rubber
145199

146200
"synthetic_fibers" ->
147201
Ok SyntheticFibers
148202

149-
"upholstery" ->
150-
Ok Upholstery
151-
152203
"wood" ->
153204
Ok Wood
154205

206+
-- obsolete materials
207+
"metal" ->
208+
Ok Metal
209+
210+
-- obsolete materials
211+
"plastic" ->
212+
Ok Plastic
213+
214+
-- obsolete materials
215+
"upholstery" ->
216+
Ok Upholstery
217+
218+
-- obsolete materials
155219
"other" ->
156220
Ok OtherMaterial
157221

@@ -162,21 +226,70 @@ materialTypeFromString string =
162226
materialTypeToLabel : Material -> String
163227
materialTypeToLabel material =
164228
case material of
229+
Aluminium ->
230+
"Aluminium"
231+
232+
BatteryCell ->
233+
"Cellule de batteries"
234+
235+
Composites ->
236+
"Composites"
237+
238+
Containerboard ->
239+
"Carton"
240+
241+
Copper ->
242+
"Cuivre"
243+
244+
FerrousMetal ->
245+
"Métaux ferreux"
246+
247+
Glass ->
248+
"Verre"
249+
250+
HDPE ->
251+
"PEHD"
252+
253+
LDPE ->
254+
"PEBD"
255+
256+
-- obsolete materials
165257
Metal ->
166258
"Métal"
167259

168260
OrganicFibers ->
169261
"Fibres organiques"
170262

263+
-- obsolete materials
171264
OtherMaterial ->
172265
"Autre type de matière"
173266

267+
PET ->
268+
"PET"
269+
270+
PP ->
271+
"PP"
272+
273+
PWB ->
274+
"Carte de circuit imprimé"
275+
276+
-- obsolete materials
174277
Plastic ->
175278
"Plastique"
176279

280+
PurFoam ->
281+
"PUR"
282+
283+
RigidPlastics ->
284+
"Plastiques rigides"
285+
286+
Rubber ->
287+
"Caoutchouc"
288+
177289
SyntheticFibers ->
178290
"Fibres synthétiques"
179291

292+
-- obsolete materials
180293
Upholstery ->
181294
"Mousses et rembourrés"
182295

@@ -187,21 +300,70 @@ materialTypeToLabel material =
187300
materialTypeToString : Material -> String
188301
materialTypeToString material =
189302
case material of
303+
Aluminium ->
304+
"aluminium"
305+
306+
BatteryCell ->
307+
"battery_cell"
308+
309+
Composites ->
310+
"composites"
311+
312+
Containerboard ->
313+
"containerboard"
314+
315+
Copper ->
316+
"copper"
317+
318+
FerrousMetal ->
319+
"ferrous_metals"
320+
321+
Glass ->
322+
"glass"
323+
324+
HDPE ->
325+
"hdpe"
326+
327+
LDPE ->
328+
"ldpe"
329+
330+
-- obsolete materials
190331
Metal ->
191332
"metal"
192333

193334
OrganicFibers ->
194335
"organic_fibers"
195336

337+
-- obsolete materials
196338
OtherMaterial ->
197339
"other"
198340

341+
PET ->
342+
"pet"
343+
344+
PP ->
345+
"pp"
346+
347+
PWB ->
348+
"pwb"
349+
350+
-- obsolete materials
199351
Plastic ->
200352
"plastic"
201353

354+
PurFoam ->
355+
"pur_foam"
356+
357+
RigidPlastics ->
358+
"rigid_plastics"
359+
360+
Rubber ->
361+
"rubber"
362+
202363
SyntheticFibers ->
203364
"synthetic_fibers"
204365

366+
-- obsolete materials
205367
Upholstery ->
206368
"upholstery"
207369

0 commit comments

Comments
 (0)