Merge pull request #567 from NDLANO/subject-image-copyright

Add ImageLicense to SubjectPageVisualElement

Author: amatho

src/api/imageApi.ts

@@ -12,7 +12,7 @@ import {
   IImageMetaInformationV3DTO,
   ISearchResultV3DTO,
 } from "@ndla/types-backend/image-api";
-import { GQLQueryImageSearchArgs } from "../types/schema";
+import { GQLImageLicense, GQLQueryImageSearchArgs } from "../types/schema";
 import { fetch, resolveJson } from "../utils/apiHelpers";
 
 export async function fetchImage(imageId: string, context: Context): Promise<IImageMetaInformationV2DTO | null> {
@@ -51,3 +51,14 @@ export function convertToSimpleImage(image: IImageMetaInformationV2DTO) {
     copyright: image.copyright,
   };
 }
+
+export function convertToImageLicense(imageMeta: IImageMetaInformationV3DTO): GQLImageLicense {
+  return {
+    id: imageMeta.id,
+    title: imageMeta.title.title,
+    src: imageMeta.image.imageUrl,
+    altText: imageMeta.alttext.alttext,
+    contentType: imageMeta.image.contentType,
+    copyright: imageMeta.copyright,
+  };
+}

src/resolvers/subjectResolvers.ts

@@ -6,9 +6,10 @@
  *
  */
 
-import { ISubjectPageDTO } from "@ndla/types-backend/frontpage-api";
+import { ISubjectPageDTO, IVisualElementDTO } from "@ndla/types-backend/frontpage-api";
 import { Node } from "@ndla/types-taxonomy";
 import {
+  GQLImageLicense,
   GQLQuerySubjectArgs,
   GQLQuerySubjectCollectionArgs,
   GQLSubject,
@@ -17,6 +18,8 @@ import {
 } from "../types/schema";
 import { filterMissingArticles } from "../utils/articleHelpers";
 import { fetchCompetenceGoalSetCodes } from "../api/searchApi";
+import { fetchImageV3 } from "../api";
+import { convertToImageLicense } from "../api/imageApi";
 
 export const Query = {
   async subject(_: any, { id }: GQLQuerySubjectArgs, context: ContextWithLoaders): Promise<Node> {
@@ -117,4 +120,16 @@ export const resolvers = {
       );
     },
   },
+  SubjectPageVisualElement: {
+    async imageLicense(
+      visualElement: IVisualElementDTO,
+      _: any,
+      context: ContextWithLoaders,
+    ): Promise<GQLImageLicense | undefined> {
+      const imageId = parseInt(visualElement.url.split("/").pop() ?? "");
+      if (isNaN(imageId)) return undefined;
+      const image = await fetchImageV3(imageId, context);
+      return convertToImageLicense(image);
+    },
+  },
 };

src/schema.ts

@@ -809,6 +809,7 @@ export const typeDefs = gql`
     type: String!
     url: String!
     alt: String
+    imageLicense: ImageLicense
   }
 
   type SubjectPageAbout {

src/types/schema.d.ts

@@ -1918,6 +1918,7 @@ export type GQLSubjectPageBanner = {
 export type GQLSubjectPageVisualElement = {
   __typename?: 'SubjectPageVisualElement';
   alt?: Maybe<Scalars['String']['output']>;
+  imageLicense?: Maybe<GQLImageLicense>;
   type: Scalars['String']['output'];
   url: Scalars['String']['output'];
 };
@@ -3898,6 +3899,7 @@ export type GQLSubjectPageBannerResolvers<ContextType = any, ParentType extends
 
 export type GQLSubjectPageVisualElementResolvers<ContextType = any, ParentType extends GQLResolversParentTypes['SubjectPageVisualElement'] = GQLResolversParentTypes['SubjectPageVisualElement']> = {
   alt?: Resolver<Maybe<GQLResolversTypes['String']>, ParentType, ContextType>;
+  imageLicense?: Resolver<Maybe<GQLResolversTypes['ImageLicense']>, ParentType, ContextType>;
   type?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
   url?: Resolver<GQLResolversTypes['String'], ParentType, ContextType>;
   __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;