feat: add models per box

back-end/src/services/box.service.ts

@@ -1,8 +1,10 @@
 import { new_client } from '../db/db_client';
 import { Box } from '../types/box';
+import { Model } from '../types/model';
 import { Piece } from '../types/piece';
 import { getPiece } from './pieces.service';
 import { Either, eitherLeft, eitherRight, Pair, createPair } from '../utils/utils';
+import modelService from './model.service';
 
 type DBBox = {
 	id_boite: number;
@@ -33,11 +35,25 @@ async function removePieceFromBox(id_box: number, id_piece: number) {
   const res = await client.query(`DELETE FROM contenir WHERE id_boite = $1 AND id_piece = $2;`, [ id_box, id_piece ]);
 }
 
+async function getModelsFromBox(id_box: number): Promise<Array<Model>> {
+  const client = new_client();
+  const res = await client.query(`SELECT * FROM modeles_faisables_boite($1);`, [ id_box ]);
+  const arr: Array<Model> = new Array();
+  for (let i = 0; i < res.rows.length; ++i) {
+    const model: Either<Model, string> = await modelService.getModel(res.rows[i]['id_model']);
+    if (model.hasRight)
+      continue;
+    arr.push(model.left);
+  }
+  return arr;
+}
+
 async function db2box(data: DBBox): Promise<Box> {
 	const box: Box = {
 		id: data.id_boite,
 		title: data.titre_boite,
 		date: new Date(data.date_boite),
+    models: await getModelsFromBox(data.id_boite),
     pieces: await getPiecesFromBox(data.id_boite)
 	};
 

back-end/src/templates/box.ejs

@@ -25,6 +25,14 @@ function deletePiece(id) {
 	<pre>
 		id          : <%= box.id %>
 		date        : <%= box.date %>
+    modèles     :
+    <% box.models.forEach(function(m) { %>
+			<li>
+				<a href="/models/byid/<%=m.id_id_model%>">
+					<%=m.id_name%>
+				</a>
+			</li>
+		  <% }); %>
     pièces      :
     <% box.pieces.forEach(function(pair) { %>
 			<li>

back-end/src/types/box.ts

@@ -1,3 +1,4 @@
+import { Model } from './model';
 import { Pair } from '../utils/utils';
 import { Piece } from './piece';
 
@@ -5,7 +6,8 @@ type Box = {
   id: number;
   title: string;
 	date: Date;
-  pieces: Array<Pair<Piece, number>>
+  models: Array<Model>;
+  pieces: Array<Pair<Piece, number>>;
 };
 
 export { Box };