geocat: do not exclude services or maps in search

camptocamp · Nov 29, 2024 · 6658ccd · 6658ccd
1 parent c568436
commit 6658ccd
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 54 deletions.
diff --git a/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.spec.ts b/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.spec.ts
@@ -155,11 +155,12 @@ describe('ElasticsearchService', () => {
               },
             },
           ],
-          must_not: {
-            terms: {
-              resourceType: ['service', 'map', 'map/static', 'mapDigital'],
-            },
-          },
+          // SPECIFIC GEOCAT
+          // must_not: {
+          //   terms: {
+          //     resourceType: ['service', 'map', 'map/static', 'mapDigital'],
+          //   },
+          // },
         },
       })
     })
@@ -210,11 +211,12 @@ describe('ElasticsearchService', () => {
               },
             },
           ],
-          must_not: {
-            terms: {
-              resourceType: ['service', 'map', 'map/static', 'mapDigital'],
-            },
-          },
+          // SPECIFIC GEOCAT
+          // must_not: {
+          //   terms: {
+          //     resourceType: ['service', 'map', 'map/static', 'mapDigital'],
+          //   },
+          // },
         },
       })
     })
@@ -269,11 +271,12 @@ describe('ElasticsearchService', () => {
               },
             },
           ],
-          must_not: {
-            terms: {
-              resourceType: ['service', 'map', 'map/static', 'mapDigital'],
-            },
-          },
+          // SPECIFIC GEOCAT
+          // must_not: {
+          //   terms: {
+          //     resourceType: ['service', 'map', 'map/static', 'mapDigital'],
+          //   },
+          // },
         },
       })
     })
@@ -310,11 +313,12 @@ describe('ElasticsearchService', () => {
           ],
           should: [],
           must: [],
-          must_not: {
-            terms: {
-              resourceType: ['service', 'map', 'map/static', 'mapDigital'],
-            },
-          },
+          // SPECIFIC GEOCAT
+          // must_not: {
+          //   terms: {
+          //     resourceType: ['service', 'map', 'map/static', 'mapDigital'],
+          //   },
+          // },
         },
       })
     })
@@ -363,11 +367,12 @@ describe('ElasticsearchService', () => {
               },
             },
           ],
-          must_not: {
-            terms: {
-              resourceType: ['service', 'map', 'map/static', 'mapDigital'],
-            },
-          },
+          // SPECIFIC GEOCAT
+          // must_not: {
+          //   terms: {
+          //     resourceType: ['service', 'map', 'map/static', 'mapDigital'],
+          //   },
+          // },
         },
       })
     })
@@ -461,11 +466,12 @@ describe('ElasticsearchService', () => {
                 },
               },
             ],
-            must_not: {
-              terms: {
-                resourceType: ['service', 'map', 'map/static', 'mapDigital'],
-              },
-            },
+            // SPECIFIC GEOCAT
+            // must_not: {
+            //   terms: {
+            //     resourceType: ['service', 'map', 'map/static', 'mapDigital'],
+            //   },
+            // },
             should: [
               {
                 geo_shape: {
@@ -576,11 +582,12 @@ describe('ElasticsearchService', () => {
                   },
                 },
               ],
-              must_not: {
-                terms: {
-                  resourceType: ['service', 'map', 'map/static', 'mapDigital'],
-                },
-              },
+              // SPECIFIC GEOCAT
+              // must_not: {
+              //   terms: {
+              //     resourceType: ['service', 'map', 'map/static', 'mapDigital'],
+              //   },
+              // },
             },
           },
           from: 0,

diff --git a/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts b/libs/api/repository/src/lib/gn4/elasticsearch/elasticsearch.service.ts
@@ -304,7 +304,6 @@ export class ElasticsearchService {
     return {
       bool: {
         must,
-        must_not,
         should,
         filter,
       },
@@ -353,14 +352,6 @@ export class ElasticsearchService {
               },
             },
           ],
-          must_not: {
-            ...this.queryFilterOnValues('resourceType', [
-              'service',
-              'map',
-              'map/static',
-              'mapDigital',
-            ]),
-          },
         },
       },
       _source: ['resourceTitleObject', 'uuid'],

diff --git a/libs/api/repository/src/lib/gn4/organizations/organizations-from-metadata.service.spec.ts b/libs/api/repository/src/lib/gn4/organizations/organizations-from-metadata.service.spec.ts
@@ -271,16 +271,17 @@ describe.each(['4.2.2-00', '4.2.3-xx', '4.2.5-xx'])(
               query: {
                 bool: {
                   must: [],
-                  must_not: {
-                    terms: {
-                      resourceType: [
-                        'service',
-                        'map',
-                        'map/static',
-                        'mapDigital',
-                      ],
-                    },
-                  },
+                  // SPECIFIC GEOCAT
+                  // must_not: {
+                  //   terms: {
+                  //     resourceType: [
+                  //       'service',
+                  //       'map',
+                  //       'map/static',
+                  //       'mapDigital',
+                  //     ],
+                  //   },
+                  // },
                   should: [],
                   filter: [{ terms: { isTemplate: ['n'] } }],
                 },