🐛 fix relationships

This commit is contained in:
Flam3rboy
2021-09-20 21:34:33 +02:00
parent fe34c5da87
commit 5b3ac6dadb
2 changed files with 15 additions and 255 deletions

View File

@@ -21,20 +21,20 @@ router.get("/", route({}), async (req: Request, res: Response) => {
const user = await User.findOneOrFail({ where: { id: req.user_id }, relations: ["relationships", "relationships.to"] });
//TODO DTO
const related_users = user.relationships.map(r => {
const related_users = user.relationships.map((r) => {
return {
id: r.to.id,
type: r.type,
nickname: null,
user: r.to.toPublicUser(),
}
})
user: r.to.toPublicUser()
};
});
return res.json(related_users);
});
export interface RelationshipPutSchema {
type: RelationshipType;
type?: RelationshipType;
}
router.put("/:id", route({ body: "RelationshipPutSchema" }), async (req: Request, res: Response) => {
@@ -42,7 +42,7 @@ router.put("/:id", route({ body: "RelationshipPutSchema" }), async (req: Request
req,
res,
await User.findOneOrFail({ id: req.params.id }, { relations: ["relationships", "relationships.to"], select: userProjection }),
req.body.type
req.body.type ?? RelationshipType.friends
);
});
@@ -59,7 +59,7 @@ router.post("/", route({ body: "RelationshipPostSchema" }), async (req: Request,
relations: ["relationships", "relationships.to"],
select: userProjection,
where: {
discriminator: String(req.body.discriminator).padStart(4, '0'), //Discord send the discriminator as integer, we need to add leading zeroes
discriminator: String(req.body.discriminator).padStart(4, "0"), //Discord send the discriminator as integer, we need to add leading zeroes
username: req.body.username
}
}),