Merge pull request #152 from import-ai/fix/assets_name

fix: improve asset name handling and add timestamps to resource DTOs

Author: LucienShui

package.json

@@ -1,6 +1,6 @@
 {
   "name": "omniboxd",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "private": true,
   "scripts": {
     "build": "nest build",

src/resources/dto/resource.dto.ts

@@ -14,6 +14,8 @@ export class ResourceMetaDto {
   resource_type: string;
   attrs: Record<string, any>;
   tags: TagDto[];
+  created_at: string;
+  updated_at: string;
 
   static fromEntity(resource: Resource, tags: TagDto[] = []) {
     const dto = new ResourceMetaDto();
@@ -23,6 +25,8 @@ export class ResourceMetaDto {
     dto.resource_type = resource.resourceType;
     dto.attrs = resource.attrs;
     dto.tags = tags;
+    dto.created_at = resource.createdAt.toISOString();
+    dto.updated_at = resource.updatedAt.toISOString();
     return dto;
   }
 }
@@ -40,6 +44,8 @@ export class ResourceDto {
   current_permission: ResourcePermission;
   path: ResourceMetaDto[];
   space_type: SpaceType;
+  created_at: string;
+  updated_at: string;
 
   static fromEntity(
     resource: Resource,
@@ -61,6 +67,8 @@ export class ResourceDto {
     dto.current_permission = currentPermission;
     dto.path = path;
     dto.space_type = spaceType;
+    dto.created_at = resource.createdAt.toISOString();
+    dto.updated_at = resource.updatedAt.toISOString();
     return dto;
   }
 }

src/resources/file-resources.e2e-spec.ts

@@ -13,7 +13,7 @@ export const uploadLanguageDatasets = [
   { filename: '🚀🔥.txt', content: '😊👍🌍' },
 ];
 
-describe('ResourcesController (e2e)', () => {
+describe('FileResourcesController (e2e)', () => {
   let client: TestClient;
 
   beforeAll(async () => {

src/resources/resources.e2e-spec.ts

@@ -677,6 +677,16 @@ describe('ResourcesController (e2e)', () => {
       expect(childResource).toBeDefined();
       expect(childResource.name).toBe('Child Resource for List');
       expect(childResource.attrs).toEqual(childAttrs);
+
+      // Check for required timestamp fields
+      expect(childResource).toHaveProperty('created_at');
+      expect(childResource).toHaveProperty('updated_at');
+      expect(childResource.created_at).toMatch(
+        /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/,
+      );
+      expect(childResource.updated_at).toMatch(
+        /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/,
+      );
     });
 
     it('should return empty array for resource with no children', async () => {

src/resources/resources.service.ts

@@ -149,6 +149,7 @@ export class ResourcesService {
         'name',
         'attrs',
         'parentId',
+        'createdAt',
         'updatedAt',
         'namespaceId',
         'resourceType',
@@ -331,6 +332,7 @@ export class ResourcesService {
         'name',
         'attrs',
         'parentId',
+        'createdAt',
         'updatedAt',
         'namespaceId',
         'resourceType',
@@ -459,7 +461,16 @@ export class ResourcesService {
     }
 
     const children = await this.resourceRepository.find({
-      select: ['id', 'name', 'parentId', 'resourceType', 'attrs', 'tagIds'],
+      select: [
+        'id',
+        'name',
+        'parentId',
+        'resourceType',
+        'attrs',
+        'tagIds',
+        'createdAt',
+        'updatedAt',
+      ],
       where: {
         namespaceId,
         parentId: resourceId,
@@ -574,7 +585,15 @@ export class ResourcesService {
     while (true) {
       const resource = await this.resourceRepository.findOne({
         where: { namespaceId, id: resourceId },
-        select: ['id', 'name', 'resourceType', 'parentId', 'globalPermission'],
+        select: [
+          'id',
+          'name',
+          'resourceType',
+          'parentId',
+          'globalPermission',
+          'createdAt',
+          'updatedAt',
+        ],
       });
       if (!resource) {
         throw new NotFoundException('Resource not found');
@@ -698,7 +717,8 @@ export class ResourcesService {
     parentId?: string,
     resourceId?: string,
   ) {
-    const originalName = encodeFileName(fileName);
+    const originalName = getOriginalFileName(fileName);
+    const encodedName = encodeFileName(fileName);
     let resource: Resource;
     if (resourceId) {
       resource = await this.get(resourceId);
@@ -713,6 +733,7 @@ export class ResourcesService {
         parentId,
         attrs: {
           original_name: originalName,
+          encoded_name: encodedName,
           mimetype: mimetype,
         },
       });