encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor

Browse Source
This commit is contained in:
lesion
2022-06-07 21:13:12 +02:00
parent 2a4b899cd0
commit 764612b125
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/api/controller/cohort.js
View File

@@ -6,9 +6,6 @@ const Place = require('../models/place')
const log = require('../../log') const log = require('../../log')
const dayjs = require('dayjs') const dayjs = require('dayjs')
// const { sequelize } = require('../models/index')
const { Op, Sequelize } = require('sequelize') const { Op, Sequelize } = require('sequelize')
const cohortController = { const cohortController = {
@@ -91,14 +88,12 @@ const cohortController = {
} }
const events = await Event.findAll({ const events = await Event.findAll({
logging: console.log,
where, where,
attributes: { attributes: {
exclude: ['likes', 'boost', 'userId', 'is_visible', 'createdAt', 'updatedAt', 'description', 'resources'] exclude: ['likes', 'boost', 'userId', 'is_visible', 'createdAt', 'updatedAt', 'description', 'resources']
}, },
order: ['start_datetime'], order: ['start_datetime'],
include: [ include: [
// { model: Resource, required: false, attributes: ['id'] },
{ {
model: Tag, model: Tag,
order: [Sequelize.literal('(SELECT COUNT("tagTag") FROM event_tags WHERE tagTag = tag) DESC')], order: [Sequelize.literal('(SELECT COUNT("tagTag") FROM event_tags WHERE tagTag = tag) DESC')],

2
server/api/controller/event.js
View File

@@ -611,10 +611,8 @@ const eventController = {
if (tags && places) { if (tags && places) {
where[Op.or] = { where[Op.or] = {
placeId: places ? places.split(',') : [], placeId: places ? places.split(',') : [],
// '$tags.tag$': Sequelize.literal(`EXISTS (SELECT 1 FROM event_tags WHERE tagTag in ( ${Sequelize.QueryInterface.escape(tags)} ) )`)
} }
} else if (tags) { } else if (tags) {
// where[Op.and] = Sequelize.literal(`EXISTS (SELECT 1 FROM event_tags WHERE eventId=event.id AND tagTag in (?))`)
where[Op.and] = Sequelize.fn('EXISTS', Sequelize.literal('SELECT 1 FROM event_tags WHERE "event_tags"."eventId"="event".id AND "tagTag" in (?)')) where[Op.and] = Sequelize.fn('EXISTS', Sequelize.literal('SELECT 1 FROM event_tags WHERE "event_tags"."eventId"="event".id AND "tagTag" in (?)'))
replacements.push(tags) replacements.push(tags)
} else if (places) { } else if (places) {

3
wp-plugin/oauth.php
View File

@@ -14,7 +14,7 @@ function wpgancio_delete_post ($post_id) {
$gancio_id = get_post_meta($post_id, 'wpgancio_gancio_id', TRUE); $gancio_id = get_post_meta($post_id, 'wpgancio_gancio_id', TRUE);
if ($gancio_id) { if ($gancio_id) {
$http = _wp_http_get_object(); $http = _wp_http_get_object();
$response = $http->request( "${instance_url}/api/event/${gancio_id}", array( $http->request( "${instance_url}/api/event/${gancio_id}", array(
'method' => 'DELETE', 'method' => 'DELETE',
'headers' => array ( 'headers' => array (
'Authorization' => 'Bearer ' . get_option('wpgancio_token') 'Authorization' => 'Bearer ' . get_option('wpgancio_token')
@@ -30,6 +30,7 @@ function wpgancio_save_event ($post_id) {
return sanitize_title($tag->name); return sanitize_title($tag->name);
} }
// TODO: merge event tags with post tags
$tmp_tags = get_the_terms( $event, 'event-tag' ); $tmp_tags = get_the_terms( $event, 'event-tag' );
$tags = array_map('tagName', $tmp_tags); $tags = array_map('tagName', $tmp_tags);