Merge pull request #48 from alexa/csr-ddb-provider

Added ddb provider for catalog explorer. Also added a new response fo…

catalog-explorer/lambda/catalog-provider.ts

@@ -4,7 +4,7 @@
 
 // representation of a page token; simply a raw string as the real representation
 // will differ with each catalog provider instance
-export type PageToken = string;
+export type PageToken = any;
 
 // a single page of items, contains next/previous tokens to allow for easy navigation
 export interface Page<Item>{
@@ -58,7 +58,7 @@ export interface CatalogProvider<SearchConditions, Item> {
     performSearch(
         searchConditions: SearchConditions,
         pageSize: number
-    ): RecommendationResult<SearchConditions, Item>;
+    ): RecommendationResult<SearchConditions, Item> | Promise<RecommendationResult<SearchConditions, Item>>;
 
     // get a page of items for the given search conditions, page token,
     // page size and paging direction
@@ -67,7 +67,7 @@ export interface CatalogProvider<SearchConditions, Item> {
         pageSize: number,
         pageToken: PageToken | undefined,
         pagingDirection: PagingDirection
-    ): RecommendationResult<SearchConditions, Item>;
+    ): RecommendationResult<SearchConditions, Item> | Promise<RecommendationResult<SearchConditions, Item>>;
 
     // selects the item at the given index from the provided page
     selectItem(

catalog-explorer/lambda/handlers/base-api-handler.ts

@@ -23,7 +23,7 @@ export abstract class BaseApiHandler implements RequestHandler {
         return util.isApiRequest(handlerInput, this.apiName);
     }
 
-    abstract handle(handlerInput : HandlerInput): Response;
+    abstract handle(handlerInput : HandlerInput): Response| Promise<Response>;
 
     // returns activeCatalog from session, when session is used instead of focus or
     // when there is no active catalog reference provided in the arguments

catalog-explorer/lambda/handlers/get-page-handler.ts

@@ -35,10 +35,10 @@ export class GetPageHandler extends BaseApiHandler{
         super(apiName);
     }
 
-    handle(handlerInput: HandlerInput): Response {
+    async handle(handlerInput: HandlerInput): Promise<Response> {
         const args = util.getApiArguments(handlerInput) as Arguments;
 
-        let recommendationResult: RecommendationResult<any,any>;
+        let recommendationResult: RecommendationResult<any,any> | Promise< RecommendationResult<any,any>>;
         const catalogRef = super.getActiveCatalog(handlerInput, args.catalogRef);
 
         if (CatalogExplorer.useSessionArgs){
@@ -51,7 +51,9 @@ export class GetPageHandler extends BaseApiHandler{
             // needs to be refactored for pagingDirection and current page size, once support for generics on actions is added
             const pagingDirection = PagingDirection.NEXT;
             recommendationResult = catalogProvider.getRecommendationsPage(args.searchConditions, catalogRef.pageSize, args.pageToken, pagingDirection);
+
         }
+        recommendationResult = await Promise.resolve(recommendationResult)
         //converting rescoped boolean to number, as ACDL does not support boolean datatype
         const modifiedRecommendationResult = util.modifyRecommendationResultRescoped(recommendationResult);
 
@@ -61,12 +63,11 @@ export class GetPageHandler extends BaseApiHandler{
             .getResponse();
     }
 
-    getNewRecommendationResultFromSession(handlerInput: HandlerInput, args: Arguments, catalogRef: CatalogReference): RecommendationResult<any,any>{
+    async getNewRecommendationResultFromSession(handlerInput: HandlerInput, args: Arguments, catalogRef: CatalogReference): Promise<RecommendationResult<any,any>>{
         const sessionState = CatalogExplorerSessionState.load(handlerInput);
         const providerState = sessionState.providerState;
 
         const catalogProvider: CatalogProvider<any, any> = CatalogExplorer.getProvider(catalogRef, providerState);
-
         // get arguments from session state
         const pageToken = sessionState.argsState?.upcomingPageToken;
         const searchConditions = sessionState.argsState?.searchConditions;
@@ -76,8 +77,8 @@ export class GetPageHandler extends BaseApiHandler{
         if (pagingDirection === undefined) {
             throw new Error("Paging Direction not present in session")
         }
-        const recommendationResult = catalogProvider.getRecommendationsPage(searchConditions,currPageSize!, pageToken, pagingDirection);
-
+        let recommendationResult = catalogProvider.getRecommendationsPage(searchConditions,currPageSize!, pageToken, pagingDirection);
+        recommendationResult = await Promise.resolve(recommendationResult)
         // updating session state arguments
         sessionState.providerState = catalogProvider.serialize();
         sessionState.argsState!.currentPageTokens = {

catalog-explorer/lambda/handlers/search-handler.ts

@@ -26,12 +26,12 @@ export class SearchHandler extends BaseApiHandler {
         return util.isApiRequestPrefix(handlerInput, this.apiName);
     }
 
-    handle(handlerInput : HandlerInput): Response {
+    async handle(handlerInput : HandlerInput): Promise<Response >{
         const args = util.getApiArguments(handlerInput) as any;
         const searchType = this.getSearchTypeFromAPI(handlerInput);
-        let recommendationResult : RecommendationResult<any,any>;
+        let recommendationResult : RecommendationResult<any,any> | Promise<RecommendationResult<any,any>>;
         if (searchType === "new" || searchType == "refine"){
-            recommendationResult = this.newSearchSession(handlerInput,searchType);
+            recommendationResult = await Promise.resolve(this.newSearchSession(handlerInput,searchType));
         }
         else {
             throw new Error("Search Type fetched from API is incorrect");
@@ -45,9 +45,9 @@ export class SearchHandler extends BaseApiHandler {
             .getResponse();
     }
 
-    newSearchSession(handlerInput: HandlerInput, searchType : string): RecommendationResult<any,any>{
+    async newSearchSession(handlerInput: HandlerInput, searchType : string): Promise<RecommendationResult<any,any>>{
         const sessionState = CatalogExplorerSessionState.load(handlerInput);
-
+      
         // get catalog reference out of session, instead of arguments
         const catalogRef = sessionState.activeCatalog;
         const providerState = sessionState.providerState;
@@ -64,7 +64,7 @@ export class SearchHandler extends BaseApiHandler {
             const refinedSearchConditions = { ...searchConditionsFromSession, ...newSearchConditions };
             newSearchConditions = refinedSearchConditions;
         }
-        const recommendationResult = catalogProvider.performSearch(newSearchConditions, catalogRef.pageSize);
+        const recommendationResult = await Promise.resolve(catalogProvider.performSearch(newSearchConditions, catalogRef.pageSize));
 
         // updating session state arguments
         sessionState.providerState = catalogProvider.serialize();