test(resources): expect 404 when not-found

Author: ycdzj

src/api-key/api-key.e2e-spec.ts

@@ -197,7 +197,7 @@ describe('APIKeyController (e2e)', () => {
     await client.post('/api/v1/api-keys').send(apiKeyData).expect(403);
   });
 
-  it('should return 403 when user tries to create API key with resource they do not have write access to', async () => {
+  it('should return 404 when user tries to create API key with resource they do not have write access to', async () => {
     const apiKeyData = {
       user_id: client.user.id,
       namespace_id: client.namespace.id,
@@ -212,6 +212,6 @@ describe('APIKeyController (e2e)', () => {
       },
     };
 
-    await client.post('/api/v1/api-keys').send(apiKeyData).expect(403);
+    await client.post('/api/v1/api-keys').send(apiKeyData).expect(404);
   });
 });

src/attachments/attachments.e2e-spec.ts

@@ -114,7 +114,7 @@ describe('AttachmentsController (e2e)', () => {
           `/api/v1/namespaces/${client.namespace.id}/resources/${nonExistentResourceId}/attachments`,
         )
         .attach('file[]', Buffer.from(testContent), 'test.txt')
-        .expect(403);
+        .expect(HttpStatus.NOT_FOUND);
     });
   });
 

src/namespace-resources/namespace-resources.service.ts

@@ -609,12 +609,15 @@ export class NamespaceResourcesService {
   }
 
   async restore(userId: string, id: string) {
-    const resource = await this.resourceRepository.findOneOrFail({
+    const resource = await this.resourceRepository.findOne({
       withDeleted: true,
       where: {
         id,
       },
     });
+    if (!resource) {
+      throw new NotFoundException('Resource not found.');
+    }
     if (resource.parentId === null) {
       throw new BadRequestException('Cannot restore root resource.');
     }

src/permissions/permissions.e2e-spec.ts

@@ -74,12 +74,12 @@ describe('PermissionsController (e2e)', () => {
         .expect(HttpStatus.FORBIDDEN);
     });
 
-    it('should return 403 for non-existent resource', async () => {
+    it('should return 404 for non-existent resource', async () => {
       await client
         .get(
           `/api/v1/namespaces/${client.namespace.id}/resources/nonexistent/permissions`,
         )
-        .expect(HttpStatus.FORBIDDEN);
+        .expect(HttpStatus.NOT_FOUND);
     });
   });
 

src/wizard/wizard.e2e-spec.ts

@@ -447,8 +447,8 @@ describe('WizardController (e2e)', () => {
         .post('/api/v1/wizard/collect')
         .send(collectData);
 
-      // Invalid parent_id results in permission error (403) rather than validation error (400)
-      expect([HttpStatus.BAD_REQUEST, HttpStatus.FORBIDDEN]).toContain(
+      // Invalid parent_id results in not-found error (404) rather than validation error (400)
+      expect([HttpStatus.BAD_REQUEST, HttpStatus.NOT_FOUND]).toContain(
         response.status,
       );
     });