feat: request organization from api

mapillary · Sep 6, 2022 · 5017e60 · 5017e60
1 parent 486d5b2
commit 5017e60
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/api/provider/GraphConverter.ts b/src/api/provider/GraphConverter.ts
@@ -81,7 +81,7 @@ export class GraphConverter {
 
         source.cluster = source.sfm_cluster ?? { id: null, url: null };
         source.creator = { id: null, username: null };
-        source.owner = source.owner ?? { id: null };
+        source.owner = source.organization ?? { id: null };
         source.mesh = source.mesh ?? { id: null, url: null };
 
         return source;

diff --git a/src/api/provider/GraphEnts.ts b/src/api/provider/GraphEnts.ts
@@ -12,6 +12,7 @@ export interface GraphCoreImageEnt extends IDEnt {
 
 export interface GraphSpatialImageEnt extends SpatialImageEnt {
     merge_cc: number;
+    organization: IDEnt;
     sfm_cluster: URLEnt;
     thumb_1024_url: string;
     thumb_2048_url: string;

diff --git a/src/api/provider/GraphQueryCreator.ts b/src/api/provider/GraphQueryCreator.ts
@@ -30,6 +30,7 @@ export class GraphQueryCreator {
             'height',
             'merge_cc',
             'mesh',
+            'organization',
             'quality_score',
             'sfm_cluster',
             'thumb_1024_url',

diff --git a/test/api/provider/GraphConverter.test.ts b/test/api/provider/GraphConverter.test.ts
@@ -148,7 +148,8 @@ describe("GraphConverter.spatialImage", () => {
             id: 'image-id',
             merge_cc: 7,
             mesh: { id: 'mesh-id', url: 'mesh-url' },
-            owner: { id: 'owner-id' },
+            organization: { id: 'owner-id' },
+            owner: null,
             quality_score: 0.8,
             sfm_cluster: { id: 'cluster-id', url: 'cluster-url' },
             thumb: null,
@@ -180,7 +181,7 @@ describe("GraphConverter.spatialImage", () => {
         expect(image.id).toBe(ent.id);
         expect(image.merge_id).toBe(ent.merge_cc.toString());
         expect(image.mesh.url).toBe(ent.mesh.url);
-        expect(image.owner.id).toBe(ent.owner.id);
+        expect(image.owner.id).toBe(ent.organization.id);
         expect(image.quality_score).toBe(ent.quality_score);
         expect(image.thumb.url).toBe(ent.thumb_1024_url);
         expect(image.width).toBe(ent.width);
@@ -205,6 +206,7 @@ describe("GraphConverter.spatialImage", () => {
             id: 'image-id',
             merge_cc: 7,
             mesh: null,
+            organization: null,
             owner: null,
             quality_score: 0.8,
             sfm_cluster: null,