added get new by id

CalumW1 · Nov 11, 2024 · 8c953c6 · 8c953c6
1 parent 879676c
commit 8c953c6
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 14 deletions.
diff --git a/src/constants.ts b/src/constants.ts
@@ -115,6 +115,9 @@ export const UBI_GETNEWS = (
 ) =>
   `?categoriesFilter=${categoriesFilter}&mediaFilter=${mediaFilter}&placementFilter=${placementFilter}&locale=${locale}&fallbackLocale=${fallbackLocale}&limit=${limit}&skip=${skip}&startIndex=${startIndex}&tags=BR-rainbow-six%20GA-siege`;
 
+export const UBI_GETNEWSBYID = (id: string, locale: string, fallbackLocale: string) =>
+  `/${id}?entryId=${id}&locale=${locale}&fallbackLocale=${fallbackLocale}&tags=BR-rainbow-six%20GA-siege`;
+
 export const AvatarURI = (userId: string, size: number) =>
   `https://avatars.ubisoft.com/${userId}/default_${
     size === 500 ? 'tall' : `${size}_${size}`

diff --git a/src/index.ts b/src/index.ts
@@ -21,6 +21,8 @@ import { AdvancedSearch } from './methods/advancedSearchMarketplace';
 import { GetTransactionsPending } from './methods/getPendingTransactions';
 import { GetTransactionHistroy } from './methods/getTransactionHistory';
 import { GetNews } from './methods/getNews';
+import { News } from './interfaces/news';
+import { GetNewsById } from './methods/getNewsById';
 
 export class R6StatAPI {
   public async login(email: string, password: string): Promise<string> {
@@ -112,7 +114,7 @@ export class R6StatAPI {
     limit: number,
     skip: number,
     startIndex: number
-  ): Promise<any> {
+  ): Promise<News> {
     return await GetNews(
       categoriesFilter,
       mediaFilter,
@@ -124,4 +126,8 @@ export class R6StatAPI {
       startIndex
     );
   }
+
+  public async GetNewsById(id: string, locale: string, fallbackLocale: string): Promise<News> {
+    return await GetNewsById(id, locale, fallbackLocale);
+  }
 }
diff --git a/src/methods/getNews.ts b/src/methods/getNews.ts
@@ -35,8 +35,7 @@ export const GetNews = async (
 };
 
 const BuildNews = async (data: any): Promise<News> => {
-
-  const news : News = {
+  const news: News = {
     total: data.total,
     tags: data.tags as string[],
     mediaFilter: data.mediaFilter,
@@ -45,17 +44,16 @@ const BuildNews = async (data: any): Promise<News> => {
     limit: data.limit,
     startIndex: data.startIndex,
     skip: data.skip,
-    items: await BuildNewsItems(data.items)
-  }
+    items: await BuildNewsItems(data.items),
+  };
   return news;
-}
+};
 
 const BuildNewsItems = async (newsItems: any): Promise<NewsItems[]> => {
-
   const news: NewsItems[] = [];
 
   newsItems.forEach(async (item: any) => {
-    const newsItem : NewsItems = {
+    const newsItem: NewsItems = {
       id: item.id,
       type: item.type,
       tag: item.tag,
@@ -68,14 +66,14 @@ const BuildNewsItems = async (newsItems: any): Promise<NewsItems[]> => {
       trackingPageValue: item.trackingPageValue,
       readTime: item.readTime,
       author: item.authors,
-      thumbnail: item?.thumbnail as Thumbnail ?? {},
-      button: item?.button as Button ?? {},
+      thumbnail: (item?.thumbnail as Thumbnail) ?? {},
+      button: (item?.button as Button) ?? {},
       index: item?.index ?? 0,
-      prevNode: item?.prevNode as Node ?? {},
-      nextNode: item?.nextNode as Node ?? {},
-    }
+      prevNode: (item?.prevNode as Node) ?? {},
+      nextNode: (item?.nextNode as Node) ?? {},
+    };
     news.push(newsItem);
   });
 
   return news;
-}
+};
diff --git a/src/methods/getNewsById.ts b/src/methods/getNewsById.ts
@@ -0,0 +1,63 @@
+import { NEWS_AUTH_TOKEN, UBI_GETNEWSBYID, UBI_NEWS_URI } from '../constants';
+import { Button, News, NewsItems, Thumbnail, Node } from '../interfaces/news';
+import { ApiClient } from './apiClient';
+
+export const GetNewsById = async (
+  id: string,
+  locale: string,
+  fallbackLocale: string
+): Promise<News> => {
+  const header = {
+    Authorization: NEWS_AUTH_TOKEN,
+  };
+
+  const URI = UBI_NEWS_URI + UBI_GETNEWSBYID(id, locale, fallbackLocale);
+
+  const data = await ApiClient(URI, header, 'GET');
+
+  return await BuildNews(data);
+};
+
+const BuildNews = async (data: any): Promise<News> => {
+  const news: News = {
+    total: data.total,
+    tags: data.tags as string[],
+    mediaFilter: data.mediaFilter,
+    categoriesFilter: data.categoriesFilter,
+    placementFilter: data.placementFilter as string[],
+    limit: data.limit,
+    startIndex: data.startIndex,
+    skip: data.skip,
+    items: await BuildNewsItems(data.items),
+  };
+  return news;
+};
+
+const BuildNewsItems = async (newsItems: any): Promise<NewsItems[]> => {
+  const news: NewsItems[] = [];
+
+  newsItems.forEach(async (item: any) => {
+    const newsItem: NewsItems = {
+      id: item.id,
+      type: item.type,
+      tag: item.tag,
+      categories: item.categories as string[],
+      placement: item.placement,
+      date: item.date,
+      title: item.title,
+      abstract: item.abstract,
+      content: item.content,
+      trackingPageValue: item.trackingPageValue,
+      readTime: item.readTime,
+      author: item.authors,
+      thumbnail: (item?.thumbnail as Thumbnail) ?? {},
+      button: (item?.button as Button) ?? {},
+      index: item?.index ?? 0,
+      prevNode: (item?.prevNode as Node) ?? {},
+      nextNode: (item?.nextNode as Node) ?? {},
+    };
+    news.push(newsItem);
+  });
+
+  return news;
+};