Merge branch 'main' into dropbox-integration

packages/api/src/@core/utils/types/original/original.file-storage.ts

@@ -43,7 +43,7 @@ import {
   OnedriveFolderOutput,
 } from '@filestorage/folder/services/onedrive/types';
 
-import {
+import { 
   OnedriveDriveInput,
   OnedriveDriveOutput,
 } from '@filestorage/drive/services/onedrive/types';
@@ -103,17 +103,13 @@ import {
   BoxSharedLinkInput,
   BoxSharedLinkOutput,
 } from '@filestorage/sharedlink/services/box/types';
-  GoogleDriveFileInput,
-  GoogleDriveFileOutput,
-} from '@filestorage/file/services/googledrive/types';
-import {
-  GoogleDriveFolderInput,
-  GoogleDriveFolderOutput,
-} from '@filestorage/folder/services/googledrive/types';
+
 import {
   GoogleDriveDriveInput,
   GoogleDriveDriveOutput,
 } from '@filestorage/drive/services/googledrive/types';
+import { GoogleDriveFolderInput, GoogleDriveFolderOutput } from '@filestorage/folder/services/googledrive/types';
+import { GoogleDriveFileInput, GoogleDriveFileOutput } from '@filestorage/file/services/googledrive/types';
 
 /* file */
 
@@ -122,16 +118,18 @@ export type OriginalFileInput =
   | BoxFileInput
   | OnedriveFileInput
   | SharepointFileInput;
-  | GoogleDriveFileInput
   | DropboxFileInput;
+  | SharepointFileInput
+  | GoogleDriveFileInput;
 
 /* folder */
 export type OriginalFolderInput =
   | BoxFolderInput
   | OnedriveFolderInput
   | SharepointFolderInput;
-  | GoogleDriveFolderInput
   | DropboxFolderInput;
+  | SharepointFolderInput
+  | GoogleDriveFolderInput;
 
 /* permission */
 export type OriginalPermissionInput =
@@ -179,16 +177,18 @@ export type OriginalFileOutput =
   | BoxFileOutput
   | OnedriveFileOutput
   | SharepointFileOutput;
-  | GoogleDriveFileOutput
   | DropboxFileOutput;
+  | SharepointFileOutput
+  | GoogleDriveFileOutput;
 
 /* folder */
 export type OriginalFolderOutput =
   | BoxFolderOutput
   | OnedriveFolderOutput
   | SharepointFolderOutput;
-  | GoogleDriveFolderOutput
   | DropboxFolderOutput;
+  | SharepointFolderOutput
+  | GoogleDriveFolderOutput;
 
 /* permission */
 export type OriginalPermissionOutput =

packages/api/src/filestorage/drive/drive.module.ts

@@ -1,22 +1,18 @@
-import { OnedriveDriveMapper } from './services/onedrive/mappers';
-import { OnedriveService } from './services/onedrive';
-import { SharepointDriveMapper } from './services/sharepoint/mappers';
-import { SharepointService } from './services/sharepoint';
-import { BullQueueModule } from '@@core/@core-services/queues/queue.module';
 import { IngestDataService } from '@@core/@core-services/unification/ingest-data.service';
 import { WebhookService } from '@@core/@core-services/webhooks/panora-webhooks/webhook.service';
 import { Utils } from '@filestorage/@lib/@utils';
 import { Module } from '@nestjs/common';
-import { DriveController } from './drive.controller';
 import { DriveService } from './services/drive.service';
 import { GoogleDriveService } from './services/googledrive';
 import { GoogleDriveMapper } from './services/googledrive/mappers';
 import { OnedriveService } from './services/onedrive';
 import { OnedriveDriveMapper } from './services/onedrive/mappers';
 import { ServiceRegistry } from './services/registry.service';
+import { SharepointService } from './services/sharepoint';
+import { SharepointDriveMapper } from './services/sharepoint/mappers';
 import { SyncService } from './sync/sync.service';
+
 @Module({
-  controllers: [DriveController],
   providers: [
     DriveService,
     SyncService,

packages/api/src/filestorage/file/file.module.ts

@@ -5,20 +5,20 @@ import { SharepointService } from './services/sharepoint';
 import { OnedriveFileMapper } from './services/onedrive/mappers';
 import { OnedriveService } from './services/onedrive';
 import { BullQueueModule } from '@@core/@core-services/queues/queue.module';
+import { IngestDataService } from '@@core/@core-services/unification/ingest-data.service';
 import { WebhookService } from '@@core/@core-services/webhooks/panora-webhooks/webhook.service';
+import { Utils } from '@filestorage/@lib/@utils';
 import { Module } from '@nestjs/common';
 import { FileController } from './file.controller';
 import { BoxService } from './services/box';
 import { BoxFileMapper } from './services/box/mappers';
 import { FileService } from './services/file.service';
-import { OnedriveService } from './services/onedrive';
-import { OnedriveFileMapper } from './services/onedrive/mappers';
-import { ServiceRegistry } from './services/registry.service';
-import { SyncService } from './sync/sync.service';
-import { IngestDataService } from '@@core/@core-services/unification/ingest-data.service';
-import { Utils } from '@filestorage/@lib/@utils';
 import { GoogleDriveService } from './services/googledrive';
 import { GoogleDriveFileMapper } from './services/googledrive/mappers';
+import { ServiceRegistry } from './services/registry.service';
+import { SharepointService } from './services/sharepoint';
+import { SharepointFileMapper } from './services/sharepoint/mappers';
+import { SyncService } from './sync/sync.service';
 
 @Module({
   controllers: [FileController],

packages/api/src/filestorage/file/services/googledrive/index.ts

@@ -1,23 +1,22 @@
 import { EncryptionService } from '@@core/@core-services/encryption/encryption.service';
 import { LoggerService } from '@@core/@core-services/logger/logger.service';
 import { PrismaService } from '@@core/@core-services/prisma/prisma.service';
+import { BUCKET_NAME } from '@@core/s3/constants';
 import { ApiResponse } from '@@core/utils/types';
 import { SyncParam } from '@@core/utils/types/interface';
+import { S3Client } from '@aws-sdk/client-s3';
+import { Upload } from '@aws-sdk/lib-storage';
 import { FileStorageObject } from '@filestorage/@lib/@types';
 import { IFileService } from '@filestorage/file/types';
 import { Injectable } from '@nestjs/common';
-import { ServiceRegistry } from '../registry.service';
-import { GoogleDriveFileOutput } from './types';
-import { S3Client } from '@aws-sdk/client-s3';
-import { Readable } from 'stream';
-import { Upload } from '@aws-sdk/lib-storage';
-import { google } from 'googleapis';
 import { OAuth2Client } from 'google-auth-library';
-import { BUCKET_NAME } from '@@core/s3/constants';
-import * as XLSX from 'xlsx';
-import * as csv from 'csv-parse';
+import { google } from 'googleapis';
 import * as mammoth from 'mammoth';
 import * as marked from 'marked';
+import { Readable } from 'stream';
+import * as XLSX from 'xlsx';
+import { ServiceRegistry } from '../registry.service';
+import { GoogleDriveFileOutput } from './types';
 
 @Injectable()
 export class GoogleDriveService implements IFileService {

packages/api/src/filestorage/file/services/googledrive/types.ts

@@ -1,8 +1,4 @@
-export interface GoogleDriveFileInput {
-  name: string;
-  mimeType?: string;
-  parents?: string[];
-}
+export type GoogleDriveFileInput = Partial<GoogleDriveFileOutput>
 
 export interface GoogleDriveFileOutput {
   kind?: string;

packages/api/src/filestorage/folder/folder.module.ts

@@ -2,8 +2,6 @@ import { DropboxFolderMapper } from './services/dropbox/mappers';
 import { DropboxService } from './services/dropbox';
 import { SharepointFolderMapper } from './services/sharepoint/mappers';
 import { SharepointService } from './services/sharepoint';
-import { OnedriveFolderMapper } from './services/onedrive/mappers';
-import { OnedriveService } from './services/onedrive';
 import { BullQueueModule } from '@@core/@core-services/queues/queue.module';
 import { CoreUnification } from '@@core/@core-services/unification/core-unification.service';
 import { IngestDataService } from '@@core/@core-services/unification/ingest-data.service';