Try to filter only for events with location

This commit is contained in:
Wolfgang Huß 2023-06-27 12:53:47 +02:00
parent f06369ad7c
commit f247e6bd7b
3 changed files with 18 additions and 5 deletions

View File

@ -1,6 +1,6 @@
import { v4 as uuid } from 'uuid'
import { neo4jgraphql } from 'neo4j-graphql-js'
import { isEmpty } from 'lodash'
import { isEmpty, cloneDeep } from 'lodash'
import { UserInputError } from 'apollo-server'
import { mergeImage, deleteImage } from './images/images'
import Resolver from './helpers/Resolver'
@ -12,12 +12,15 @@ import { createOrUpdateLocations } from './users/location'
import CONFIG from '../../config'
const maintainPinnedPosts = (params) => {
const filter = cloneDeep(params.filter)
const pinnedPostFilter = { pinned: true }
if (isEmpty(params.filter)) {
params.filter = { OR: [pinnedPostFilter, {}] }
} else {
params.filter = { OR: [pinnedPostFilter, { ...params.filter }] }
console.log('maintainPinnedPosts before: ', {...filter})
params.filter = { OR: [pinnedPostFilter, { ...filter }] }
}
console.log('maintainPinnedPosts after: ', {...filter})
return params
}
@ -38,6 +41,8 @@ export default {
params = await filterForMutedUsers(params, context)
params = filterEventDates(params)
params = await maintainPinnedPosts(params)
console.log('maintainPinnedPosts filter.OR[1].eventLocation: ', params.filter.OR[1].eventLocation)
console.log('maintainPinnedPosts filter: ', params.filter)
return neo4jgraphql(object, params, context, resolveInfo)
},
profilePagePosts: async (object, params, context, resolveInfo) => {

View File

@ -1,3 +1,10 @@
input _LocationFilter {
NOT: _LocationFilter
id: ID
id_not: ID
name: String
}
type Location {
id: ID!
name: String!
@ -25,4 +32,3 @@ type LocationMapBox {
type Query {
queryLocations(place: String!, lang: String!): [LocationMapBox]!
}

View File

@ -84,8 +84,10 @@ input _PostFilter {
group: _GroupFilter
postsInMyGroups: Boolean
postType_in: [PostType]
eventStart_gte: String
eventEnd_gte: String
eventLocation_not: _LocationFilter
eventLocation: _LocationFilter
eventStart_gte: String
eventEnd_gte: String
}
enum _PostOrdering {