change PagedResult and TranscriptInfo to interfaces (#664)

microsoft · Nov 28, 2018 · 7c0dffb · 7c0dffb
1 parent 64c978c
commit 7c0dffb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/libraries/botbuilder-azure/src/azureBlobTranscriptStore.ts b/libraries/botbuilder-azure/src/azureBlobTranscriptStore.ts
@@ -134,8 +134,7 @@ export class AzureBlobTranscriptStore implements TranscriptStore {
         .then((blobs: azure.BlobService.BlobResult[]): Promise<PagedResult<Activity>> => {
             return Promise.all(blobs.map((blob: azure.BlobService.BlobResult) => this.blobToActivity(blob)))
             .then((activities: Activity[]) => {
-                const pagedResult: PagedResult<Activity> = new PagedResult<Activity>();
-                pagedResult.items = activities;
+                const pagedResult: PagedResult<Activity> = { items: activities, continuationToken: undefined };
                 if (pagedResult.items.length === this.pageSize) {
                     pagedResult.continuationToken = blobs.slice(-1).pop().name;
                 }
@@ -169,8 +168,7 @@ export class AzureBlobTranscriptStore implements TranscriptStore {
             token
         ))
         .then((transcripts: TranscriptInfo[]) => {
-            const pagedResult: PagedResult<TranscriptInfo> = new PagedResult<TranscriptInfo>();
-            pagedResult.items = transcripts;
+            const pagedResult: PagedResult<TranscriptInfo> = { items: transcripts, continuationToken: undefined };
             if (pagedResult.items.length === this.pageSize) {
                 pagedResult.continuationToken = transcripts.slice(-1).pop().id;
             }
@@ -266,9 +264,11 @@ export class AzureBlobTranscriptStore implements TranscriptStore {
             this.client.listBlobDirectoriesSegmentedWithPrefixAsync(container, prefix, token).then(
                 (result: azure.BlobService.ListBlobsResult): void => {
                     result.entries.some((blob: azure.BlobService.BlobResult) => {
-                        const conversation: TranscriptInfo = new TranscriptInfo();
-                        conversation.id = blob.name.split('/').filter((part: string) => part).slice(-1).pop();
-                        conversation.channelId = channelId;
+                        const conversation: TranscriptInfo = {
+                            channelId: channelId,
+                            id: blob.name.split('/').filter((part: string) => part).slice(-1).pop(),
+                            created: undefined
+                        }
                         if (continuationToken) {
                             if (conversation.id === continuationToken) {
                                 continuationToken = null;

diff --git a/libraries/botbuilder-core/src/memoryTranscriptStore.ts b/libraries/botbuilder-core/src/memoryTranscriptStore.ts
@@ -71,7 +71,7 @@ export class MemoryTranscriptStore implements TranscriptStore {
 
         if (!conversationId) { throw new Error('Missing conversationId'); }
 
-        const pagedResult: PagedResult<Activity> = new PagedResult<Activity>();
+        const pagedResult: PagedResult<Activity> = { items: [], continuationToken: undefined };
         if (this.channels.has(channelId)) {
             const channel: Map<string, Activity[]> = this.channels.get(channelId);
             if (channel.has(conversationId)) {
@@ -106,7 +106,7 @@ export class MemoryTranscriptStore implements TranscriptStore {
     public listTranscripts(channelId: string, continuationToken?: string): Promise<PagedResult<TranscriptInfo>> {
         if (!channelId) { throw new Error('Missing channelId'); }
 
-        const pagedResult: PagedResult<TranscriptInfo> = new PagedResult<TranscriptInfo>();
+        const pagedResult: PagedResult<TranscriptInfo> = { items: [], continuationToken: undefined };
         if (this.channels.has(channelId)) {
             const channel: Map<string, Activity[]> = this.channels.get(channelId);
 

diff --git a/libraries/botbuilder-core/src/transcriptLogger.ts b/libraries/botbuilder-core/src/transcriptLogger.ts
@@ -185,37 +185,37 @@ export interface TranscriptStore extends TranscriptLogger {
 /**
  * Metadata for a stored transcript.
  */
-export class TranscriptInfo {
+export interface TranscriptInfo {
     /**
      * ChannelId that the transcript was taken from.
      */
-    public channelId: string;
+    channelId: string;
 
     /**
      * Conversation Id.
      */
-    public id: string;
+    id: string;
 
     /**
      * Date conversation was started.
      */
-    public created: Date;
+    created: Date;
 }
 
 /**
  * Page of results.
  * @param T type of items being paged in.
  */
 // tslint:disable-next-line:max-classes-per-file
-export class PagedResult<T> {
+export interface PagedResult<T> {
 
     /**
      * Page of items.
      */
-    public items: T[] = [];
+    items: T[];
 
     /**
      * Token used to page through multiple pages.
      */
-    public continuationToken: string;
+    continuationToken: string;
 }
diff --git a/libraries/botbuilder/src/fileTranscriptStore.ts b/libraries/botbuilder/src/fileTranscriptStore.ts
@@ -76,7 +76,7 @@ export class FileTranscriptStore implements TranscriptStore {
 
         if (!conversationId) { throw new Error('Missing conversationId'); }
 
-        const pagedResult: PagedResult<Activity> = new PagedResult<Activity>();
+        const pagedResult: PagedResult<Activity> = { items: [], continuationToken: undefined };
         const transcriptFolder: string = this.getTranscriptFolder(channelId, conversationId);
 
         return fs.exists(transcriptFolder).then((exists: boolean) => {
@@ -119,7 +119,7 @@ export class FileTranscriptStore implements TranscriptStore {
     public listTranscripts(channelId: string, continuationToken?: string): Promise<PagedResult<TranscriptInfo>> {
         if (!channelId) { throw new Error('Missing channelId'); }
 
-        const pagedResult: PagedResult<TranscriptInfo> = new PagedResult<TranscriptInfo>();
+        const pagedResult: PagedResult<TranscriptInfo> = { items: [], continuationToken: undefined };
         const channelFolder: string = this.getChannelFolder(channelId);
 
         return fs.exists(channelFolder).then((exists: boolean) => {