Merge pull request #3357 from SeedCompany/add-ethnologue-to-search

Expose Ethnologue values to Global Search

Author: CarsonF

src/components/language/language.gel.repository.ts

@@ -49,4 +49,10 @@ export class LanguageGelRepository
     const query = e.op('exists', lang.firstScriptureEngagement);
     return await this.db.run(query);
   }
+
+  async readOneByEth(ethnologueId: ID) {
+    const ethnologue = e.cast(e.Ethnologue.Language, e.uuid(ethnologueId));
+    const query = e.select(ethnologue.language, this.hydrate);
+    return await this.db.run(query);
+  }
 }

src/components/language/language.repository.ts

@@ -12,6 +12,7 @@ import {
   DuplicateException,
   ID,
   labelForView,
+  NotFoundException,
   ObjectView,
   ServerException,
   Session,
@@ -149,6 +150,23 @@ export class LanguageRepository extends DtoRepository<
       .run();
   }
 
+  async readOneByEth(ethnologueId: ID, session: Session) {
+    const dto = await this.db
+      .query()
+      .match([
+        node('eth', 'EthnologueLanguage', { id: ethnologueId }),
+        relation('in', '', 'ethnologue', ACTIVE),
+        node('node', 'Language'),
+      ])
+      .apply(this.hydrate(session))
+      .map('dto')
+      .first();
+    if (!dto) {
+      throw new NotFoundException('No Language exists for this Ethnologue id');
+    }
+    return dto;
+  }
+
   protected hydrate(session: Session, view?: ObjectView) {
     return (query: Query) =>
       query

src/components/language/language.service.ts

@@ -65,6 +65,11 @@ export class LanguageService {
     return languages.map((dto) => this.secure(dto, session));
   }
 
+  async readOneByEthId(ethnologueId: ID, session: Session) {
+    const dto = await this.repo.readOneByEth(ethnologueId, session);
+    return this.secure(dto, session);
+  }
+
   private secure(dto: UnsecuredDto<Language>, session: Session) {
     const ethnologue = this.ethnologueLanguageService.secure(
       dto.ethnologue,

src/components/search/dto/search-results.dto.ts

@@ -64,6 +64,7 @@ const publicSearchable = {
 // since they are expected to be used only for internal use.
 const privateSearchable = {
   PartnerByOrg: Partner,
+  LanguageByEth: Language,
 } as const;
 
 // Expand this to add more search types, but not result types.

src/components/search/search.module.ts

@@ -1,12 +1,13 @@
 import { Module } from '@nestjs/common';
 import { AuthorizationModule } from '../authorization/authorization.module';
+import { LanguageModule } from '../language/language.module';
 import { PartnerModule } from '../partner/partner.module';
 import { SearchRepository } from './search.repository';
 import { SearchResolver } from './search.resolver';
 import { SearchService } from './search.service';
 
 @Module({
-  imports: [PartnerModule, AuthorizationModule],
+  imports: [PartnerModule, AuthorizationModule, LanguageModule],
   providers: [SearchResolver, SearchService, SearchRepository],
   exports: [SearchService],
 })

src/components/search/search.service.ts

@@ -5,6 +5,7 @@ import { ValueOf } from 'type-fest';
 import { ID, NotFoundException, ServerException, Session } from '~/common';
 import { ResourceMap, ResourceResolver, ResourcesHost } from '~/core/resources';
 import { Privileges } from '../authorization';
+import { LanguageService } from '../language';
 import { PartnerService } from '../partner';
 import {
   SearchableMap,
@@ -38,6 +39,10 @@ export class SearchService {
       ...(await this.partners.readOnePartnerByOrgId(...args)),
       __typename: 'Partner',
     }),
+    LanguageByEth: async (...args) => ({
+      ...(await this.languages.readOneByEthId(...args)),
+      __typename: 'Language',
+    }),
   };
   /* eslint-enable @typescript-eslint/naming-convention */
 
@@ -46,6 +51,7 @@ export class SearchService {
     private readonly resourceResolver: ResourceResolver,
     private readonly privileges: Privileges,
     private readonly partners: PartnerService,
+    private readonly languages: LanguageService,
     private readonly repo: SearchRepository,
   ) {}
 
@@ -70,6 +76,7 @@ export class SearchService {
     const resourceTypes = new Set<keyof ResourceMap>(types);
     // Include dependency types for types that have identifiers in sub-resources.
     types.has('Partner') && resourceTypes.add('Organization');
+    types.has('Language') && resourceTypes.add('EthnologueLanguage');
 
     // Search for nodes based on input, only returning their id and "type"
     // which is based on their first valid search label.
@@ -106,6 +113,13 @@ export class SearchService {
                 : []),
             ];
           }
+          if (result.type === 'EthnologueLanguage') {
+            return {
+              type: 'LanguageByEth',
+              id: result.id,
+              matchedProps: ['ethnologue'],
+            } as const;
+          }
 
           // This is a sanity/type check.
           // Functionally, we shouldn't have any results at this point that