From 502215447f18a7ec876fd26ebda6650def9e672e Mon Sep 17 00:00:00 2001 From: les Date: Mon, 2 Mar 2020 15:37:42 +0100 Subject: [PATCH] working on some ideas for instance controller --- server/api/controller/instance.js | 34 +++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/server/api/controller/instance.js b/server/api/controller/instance.js index ecbc97ae..e90ae61d 100644 --- a/server/api/controller/instance.js +++ b/server/api/controller/instance.js @@ -1,14 +1,40 @@ -const { ap_user: APUser, instance: Instance, resource: Resource } = require('../models') +const { + ap_user: APUser, + instance: Instance, + resource: Resource + // event: Event +} = require('../models') +// const { Op } = require('sequelize') const instancesController = { async getAll (req, res) { - const instances = await Instance.findAll() - + const instances = await Instance.findAll({ raw: true }) return res.json(instances) }, + // async getUsedInstance (req, res) { + // // const ap_users = await APUser.findAll({ + // // attributes: ['ap_id', 'blocked', 'instanceDomain'], + // // where: { [Op.or]: [{ follower: true }, { blocked: true }] }, + // // include: [ + // // { model: Resource, attributes: ['id', 'eventId'], include: [{ model: Event, attributes: ['title'] }] }, + // // { model: Instance, attributes: ['blocked', 'name', 'domain'] }], + // // nest: true, + // // raw: true + // // }) + // const instances = await Instance.findAll({ + // include: [ + // { model: APUser, where: { [Op.or]: [{ follower: true }, { blocked: true }] }, attributes: [] } + // ], + // attributes: ['domain', 'name', 'blocked'], + // raw: true + // }) + // console.error(instances) + // res.json(instances) + // }, + /** - * get instance users + * get instance's users */ async get (req, res) { const ap_users = await APUser.findAll({ where: { instanceDomain: req.params.instance_domain }, include: [Resource] })