Correct implementation of tagsAllOf

server/lib/elastic-search-videos.ts

@@ -4,7 +4,6 @@ import { flatMap } from 'lodash'
 import { Avatar } from '@shared/models'
 import { buildSort, elasticSearch } from '../helpers/elastic-search'
 import { VideosSearchQuery } from '../types/video-search.model'
-import { inspect } from 'util'
 
 function initVideosIndex () {
   return elasticSearch.indices.create({
@@ -171,24 +170,23 @@ async function queryVideos (search: VideosSearchQuery) {
     })
   }
 
-  // FIXME: rework
   if (search.tagsOneOf) {
     filter.push({
       terms: {
-        tags: search.tagsOneOf,
-        minimum_should_match: 1
+        tags: search.tagsOneOf
       }
     })
   }
 
   if (search.tagsAllOf) {
+    for (const t of search.tagsAllOf) {
       filter.push({
-      terms: {
-        tags: search.tagsOneOf,
-        minimum_should_match: 1
+        term: {
+          tags: t
         }
       })
     }
+  }
 
   if (search.durationMin) {
     filter.push({