Monorepo for Tangled tangled.org

appview/indexer: fix failing test

negations should not include trigram tokenized terms

Signed-off-by: oppiliappan <me@oppi.li>

oppi.li 55f3bc1f 76c5d8a9

verified
+9 -10
-1
appview/indexer/repos/indexer.go
··· 309 309 for _, keyword := range opts.NegatedKeywords { 310 310 mustNots = append(mustNots, bleve.NewDisjunctionQuery( 311 311 bleveutil.MatchAndQuery("name", keyword, repoIndexerAnalyzer, 0), 312 - bleveutil.MatchAndQuery("name_trigram", keyword, "trigram", 0), 313 312 bleveutil.MatchAndQuery("description", keyword, repoIndexerAnalyzer, 0), 314 313 bleveutil.MatchAndQuery("website", keyword, repoIndexerAnalyzer, 0), 315 314 bleveutil.MatchAndQuery("topics", keyword, repoIndexerAnalyzer, 0),
+3 -3
appview/issues/issues.go
··· 23 23 "tangled.org/core/appview/models" 24 24 "tangled.org/core/appview/notify" 25 25 "tangled.org/core/appview/oauth" 26 - "tangled.org/core/ogre" 27 26 "tangled.org/core/appview/pages" 28 27 "tangled.org/core/appview/pages/repoinfo" 29 28 "tangled.org/core/appview/pagination" ··· 31 30 "tangled.org/core/appview/searchquery" 32 31 "tangled.org/core/appview/validator" 33 32 "tangled.org/core/idresolver" 33 + "tangled.org/core/ogre" 34 34 "tangled.org/core/orm" 35 35 "tangled.org/core/rbac" 36 36 "tangled.org/core/tid" ··· 49 49 logger *slog.Logger 50 50 validator *validator.Validator 51 51 indexer *issues_indexer.Indexer 52 - ogreClient *ogre.Client 52 + ogreClient *ogre.Client 53 53 } 54 54 55 55 func New( ··· 79 79 logger: logger, 80 80 validator: validator, 81 81 indexer: indexer, 82 - ogreClient: ogre.NewClient(config.Ogre.Host), 82 + ogreClient: ogre.NewClient(config.Ogre.Host), 83 83 } 84 84 } 85 85
+3 -3
appview/pulls/pulls.go
··· 26 26 "tangled.org/core/appview/models" 27 27 "tangled.org/core/appview/notify" 28 28 "tangled.org/core/appview/oauth" 29 - "tangled.org/core/ogre" 30 29 "tangled.org/core/appview/pages" 31 30 "tangled.org/core/appview/pages/markup" 32 31 "tangled.org/core/appview/pages/repoinfo" ··· 36 35 "tangled.org/core/appview/validator" 37 36 "tangled.org/core/appview/xrpcclient" 38 37 "tangled.org/core/idresolver" 38 + "tangled.org/core/ogre" 39 39 "tangled.org/core/orm" 40 40 "tangled.org/core/patchutil" 41 41 "tangled.org/core/rbac" ··· 66 66 logger *slog.Logger 67 67 validator *validator.Validator 68 68 indexer *pulls_indexer.Indexer 69 - ogreClient *ogre.Client 69 + ogreClient *ogre.Client 70 70 } 71 71 72 72 func New( ··· 96 96 logger: logger, 97 97 validator: validator, 98 98 indexer: indexer, 99 - ogreClient: ogre.NewClient(config.Ogre.Host), 99 + ogreClient: ogre.NewClient(config.Ogre.Host), 100 100 } 101 101 } 102 102
+3 -3
appview/repo/repo.go
··· 20 20 "tangled.org/core/appview/models" 21 21 "tangled.org/core/appview/notify" 22 22 "tangled.org/core/appview/oauth" 23 - "tangled.org/core/ogre" 24 23 "tangled.org/core/appview/pages" 25 24 "tangled.org/core/appview/reporesolver" 26 25 "tangled.org/core/appview/validator" 27 26 xrpcclient "tangled.org/core/appview/xrpcclient" 28 27 "tangled.org/core/eventconsumer" 29 28 "tangled.org/core/idresolver" 29 + "tangled.org/core/ogre" 30 30 "tangled.org/core/orm" 31 31 "tangled.org/core/rbac" 32 32 "tangled.org/core/tid" ··· 54 54 serviceAuth *serviceauth.ServiceAuth 55 55 validator *validator.Validator 56 56 cfClient *cloudflare.Client 57 - ogreClient *ogre.Client 57 + ogreClient *ogre.Client 58 58 } 59 59 60 60 func New( ··· 84 84 logger: logger, 85 85 validator: validator, 86 86 cfClient: cfClient, 87 - ogreClient: ogre.NewClient(config.Ogre.Host), 87 + ogreClient: ogre.NewClient(config.Ogre.Host), 88 88 } 89 89 } 90 90