diff --git a/back-end/src/services/model.service.ts b/back-end/src/services/model.service.ts index 01294bc..f33bc83 100644 --- a/back-end/src/services/model.service.ts +++ b/back-end/src/services/model.service.ts @@ -3,6 +3,7 @@ import { Model } from '../types/model'; import { Either, eitherLeft, eitherRight, Pair, createPair } from '../utils/utils'; import { Piece } from '../types/piece'; import { getPiece } from './pieces.service'; +import memberService from './member.service'; type DBModel = { id_modele: number; @@ -37,7 +38,7 @@ async function db2Model(data: DBModel) { id: data.id_modele, name: data.nom_modele, url: data.url_notice_modele, - creator: data.id_membre, + creator: (await memberService.getMember(data.id_membre)).left, inheritFrom: data.id_modele_2, pieces: await getPiecesFromModel(data.id_modele), review: await getNoteFromModel(data.id_modele), diff --git a/back-end/src/templates/model.ejs b/back-end/src/templates/model.ejs index 77e87ca..af7c6e4 100644 --- a/back-end/src/templates/model.ejs +++ b/back-end/src/templates/model.ejs @@ -14,16 +14,16 @@ <%- include('partials/header.ejs') %> +

<%= model.name %>

-      
id : <%= model.id %> url : <%= model.url %> - creator : <%= model.creator %> + creator : <%= model.creator.name %> inheritFrom : <%= model.inheritFrom %>

Liste des pièces nécessaires

diff --git a/back-end/src/templates/models.ejs b/back-end/src/templates/models.ejs index aca2b34..3d71d18 100644 --- a/back-end/src/templates/models.ejs +++ b/back-end/src/templates/models.ejs @@ -33,7 +33,7 @@ - + diff --git a/back-end/src/types/model.ts b/back-end/src/types/model.ts index 0ec8879..24484d3 100644 --- a/back-end/src/types/model.ts +++ b/back-end/src/types/model.ts @@ -1,11 +1,12 @@ import { Pair } from '../utils/utils'; +import { Member } from './member'; import { Piece } from './piece'; type Model = { id: number; name: string; url: string; - creator: number; + creator: Member; inheritFrom: number; pieces: Array> review: Pair
<%=model.id%> <%=model.name%> <%=model.creator%> <%=model.creator.name%> <%=model.review.first%>/5 (<%=model.review.second%> avis)