Browse Source

refactor(core): Better organize DefaultSearchPlugin files

Michael Bromley 4 years ago
parent
commit
2e850289a8

+ 8 - 9
packages/core/src/plugin/default-search-plugin/fulltext-search.resolver.ts → packages/core/src/plugin/default-search-plugin/api/fulltext-search.resolver.ts

@@ -7,15 +7,14 @@ import {
 } from '@vendure/common/lib/generated-types';
 import { Omit } from '@vendure/common/lib/omit';
 
-import { RequestContext } from '../../api/common/request-context';
-import { Allow } from '../../api/decorators/allow.decorator';
-import { Ctx } from '../../api/decorators/request-context.decorator';
-import { SearchResolver as BaseSearchResolver } from '../../api/resolvers/admin/search.resolver';
-import { InternalServerError } from '../../common/error/errors';
-import { Collection, FacetValue } from '../../entity';
-
-import { FulltextSearchService } from './fulltext-search.service';
-import { SearchJobBufferService } from './search-job-buffer/search-job-buffer.service';
+import { RequestContext } from '../../../api/common/request-context';
+import { Allow } from '../../../api/decorators/allow.decorator';
+import { Ctx } from '../../../api/decorators/request-context.decorator';
+import { SearchResolver as BaseSearchResolver } from '../../../api/resolvers/admin/search.resolver';
+import { InternalServerError } from '../../../common/error/errors';
+import { Collection, FacetValue } from '../../../entity/index';
+import { FulltextSearchService } from '../fulltext-search.service';
+import { SearchJobBufferService } from '../search-job-buffer/search-job-buffer.service';
 
 @Resolver('SearchResponse')
 export class ShopFulltextSearchResolver

+ 2 - 2
packages/core/src/plugin/default-search-plugin/default-search-plugin.ts

@@ -17,12 +17,12 @@ import { JobQueueService } from '../../job-queue/job-queue.service';
 import { PluginCommonModule } from '../plugin-common.module';
 import { VendurePlugin } from '../vendure-plugin';
 
+import { AdminFulltextSearchResolver, ShopFulltextSearchResolver } from './api/fulltext-search.resolver';
 import { BUFFER_SEARCH_INDEX_UPDATES, PLUGIN_INIT_OPTIONS } from './constants';
-import { AdminFulltextSearchResolver, ShopFulltextSearchResolver } from './fulltext-search.resolver';
+import { SearchIndexItem } from './entities/search-index-item.entity';
 import { FulltextSearchService } from './fulltext-search.service';
 import { IndexerController } from './indexer/indexer.controller';
 import { SearchIndexService } from './indexer/search-index.service';
-import { SearchIndexItem } from './search-index-item.entity';
 import { CollectionJobBuffer } from './search-job-buffer/collection-job-buffer';
 import { SearchIndexJobBuffer } from './search-job-buffer/search-index-job-buffer';
 import { SearchJobBufferService } from './search-job-buffer/search-job-buffer.service';

+ 1 - 1
packages/core/src/plugin/default-search-plugin/search-index-item.entity.ts → packages/core/src/plugin/default-search-plugin/entities/search-index-item.entity.ts

@@ -2,7 +2,7 @@ import { CurrencyCode, LanguageCode } from '@vendure/common/lib/generated-types'
 import { ID } from '@vendure/common/lib/shared-types';
 import { Column, Entity, Index, PrimaryColumn } from 'typeorm';
 
-import { EntityId } from '../../entity/entity-id.decorator';
+import { EntityId } from '../../../entity/entity-id.decorator';
 
 @Entity()
 export class SearchIndexItem {

+ 1 - 1
packages/core/src/plugin/default-search-plugin/indexer/indexer.controller.ts

@@ -16,7 +16,7 @@ import { FacetValue } from '../../../entity/facet-value/facet-value.entity';
 import { ProductVariant } from '../../../entity/product-variant/product-variant.entity';
 import { Product } from '../../../entity/product/product.entity';
 import { ProductPriceApplicator } from '../../../service/helpers/product-price-applicator/product-price-applicator';
-import { SearchIndexItem } from '../search-index-item.entity';
+import { SearchIndexItem } from '../entities/search-index-item.entity';
 import {
     ProductChannelMessageData,
     ReindexMessageData,

+ 1 - 1
packages/core/src/plugin/default-search-plugin/search-strategy/mysql-search-strategy.ts

@@ -5,7 +5,7 @@ import { Brackets, SelectQueryBuilder } from 'typeorm';
 import { RequestContext } from '../../../api/common/request-context';
 import { UserInputError } from '../../../common/error/errors';
 import { TransactionalConnection } from '../../../connection/transactional-connection';
-import { SearchIndexItem } from '../search-index-item.entity';
+import { SearchIndexItem } from '../entities/search-index-item.entity';
 
 import { SearchStrategy } from './search-strategy';
 import { fieldsToSelect } from './search-strategy-common';

+ 1 - 1
packages/core/src/plugin/default-search-plugin/search-strategy/postgres-search-strategy.ts

@@ -5,7 +5,7 @@ import { Brackets, SelectQueryBuilder } from 'typeorm';
 import { RequestContext } from '../../../api/common/request-context';
 import { UserInputError } from '../../../common/error/errors';
 import { TransactionalConnection } from '../../../connection/transactional-connection';
-import { SearchIndexItem } from '../search-index-item.entity';
+import { SearchIndexItem } from '../entities/search-index-item.entity';
 
 import { SearchStrategy } from './search-strategy';
 import { fieldsToSelect } from './search-strategy-common';

+ 1 - 1
packages/core/src/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.ts

@@ -5,7 +5,7 @@ import { Brackets, SelectQueryBuilder } from 'typeorm';
 import { RequestContext } from '../../../api/common/request-context';
 import { UserInputError } from '../../../common/error/errors';
 import { TransactionalConnection } from '../../../connection/transactional-connection';
-import { SearchIndexItem } from '../search-index-item.entity';
+import { SearchIndexItem } from '../entities/search-index-item.entity';
 
 import { SearchStrategy } from './search-strategy';
 import {