📁 Fixed drive item versions not working with cassandra (#2715)

linagora · Feb 3, 2023 · d2ba9bf · d2ba9bf
1 parent 062824c
commit d2ba9bf
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/twake/backend/node/src/services/documents/entities/file-version.ts b/twake/backend/node/src/services/documents/entities/file-version.ts
@@ -4,7 +4,7 @@ import { Column, Entity } from "../../../core/platform/services/database/service
 export const TYPE = "drive_file_versions";
 
 @Entity(TYPE, {
-  primaryKey: [["file_id"], "id"],
+  primaryKey: [["drive_item_id"], "id"],
   type: TYPE,
 })
 export class FileVersion {
@@ -17,8 +17,8 @@ export class FileVersion {
   provider: "internal" | "drive" | string;
 
   @Type(() => String)
-  @Column("file_id", "uuid")
-  file_id: string;
+  @Column("drive_item_id", "uuid")
+  drive_item_id: string;
 
   @Column("file_metadata", "encoded_json")
   file_metadata: DriveFileMetadata;

diff --git a/twake/backend/node/src/services/documents/services/index.ts b/twake/backend/node/src/services/documents/services/index.ts
@@ -120,7 +120,7 @@ export class DocumentsService {
       : (
           await this.fileVersionRepository.find(
             {
-              file_id: entity.id,
+              drive_item_id: entity.id,
             },
             {},
             context,
@@ -236,7 +236,7 @@ export class DocumentsService {
       );
 
       await this.repository.save(driveItem);
-      driveItemVersion.file_id = driveItem.id;
+      driveItemVersion.drive_item_id = driveItem.id;
 
       await this.fileVersionRepository.save(driveItemVersion);
       driveItem.last_version_cache = driveItemVersion;
@@ -463,7 +463,7 @@ export class DocumentsService {
           //Delete the version and stored file
           const itemVersions = await this.fileVersionRepository.find(
             {
-              file_id: item.id,
+              drive_item_id: item.id,
             },
             {},
             context,

diff --git a/twake/backend/node/src/services/documents/utils.ts b/twake/backend/node/src/services/documents/utils.ts
@@ -100,7 +100,7 @@ export const getDefaultDriveItemVersion = (
     creator_id: version.creator_id || context.user?.id,
     data: version.data || {},
     date_added: version.date_added || new Date().getTime(),
-    file_id: version.file_id || "",
+    drive_item_id: version.drive_item_id || "",
     file_metadata: version.file_metadata || {},
     file_size: version.file_size || 0,
     filename: version.filename || "",

diff --git a/twake/backend/node/src/services/documents/web/schemas.ts b/twake/backend/node/src/services/documents/web/schemas.ts
@@ -3,7 +3,7 @@ const fileVersionSchema = {
   properties: {
     id: { type: "string" },
     provider: { type: "string" },
-    file_id: { type: "string" },
+    drive_item_id: { type: "string" },
     file_metadata: {
       type: "object",
       properties: {

diff --git a/twake/frontend/src/app/features/drive/hooks/use-drive-upload.tsx b/twake/frontend/src/app/features/drive/hooks/use-drive-upload.tsx
@@ -21,7 +21,7 @@ export const useDriveUpload = () => {
         callback: async (file, context) => {
           if (file) {
             const version = {
-              file_id: context.id,
+              drive_item_id: context.id,
               provider: 'internal',
               application_id: '',
               file_metadata: {

diff --git a/twake/frontend/src/app/features/drive/types.ts b/twake/frontend/src/app/features/drive/types.ts
@@ -55,7 +55,7 @@ export type DriveItemVersion = {
 
   //The file itself, using the existing new node "file" entity
   provider: string | 'drive' | 'internal'; //Equivalent to "source" in twake/backend/node/src/services/messages/entities/message-files.ts
-  file_id: string;
+  drive_item_id: string;
   file_metadata: FileMetadata; //New field
 
   date_added: number;

diff --git a/twake/frontend/src/app/views/applications/drive/modals/versions/index.tsx b/twake/frontend/src/app/views/applications/drive/modals/versions/index.tsx
@@ -103,7 +103,7 @@ const VersionModalContent = ({ id }: { id: string }) => {
               <BaseSmall>{formatBytes(version.file_metadata.size || 0)}</BaseSmall>
             </div>
             <div className="shrink-0 ml-4">
-              <Button theme="outline" onClick={() => download(id, version.file_id)}>
+              <Button theme="outline" onClick={() => download(id, version.drive_item_id)}>
                 Download
               </Button>
             </div>