Merge pull request #279 from SpatioCore/dev-api

Almost final STAC-API-Compliant plus nicer Logging, CORS-Settings and a Favicon

Author: RobinGummels

.github/workflows/api-ci.yml

@@ -73,7 +73,7 @@ jobs:
           # API Configuration
           API_TITLE=STAC Atlas
           API_DESCRIPTION=A centralized platform for managing, indexing, and providing STAC Collection metadata
-          API_VERSION=1.1.0
+          API_VERSION=1.0.0
           EOF
       
       # Step 4: Install dependencies
@@ -166,7 +166,7 @@ jobs:
           # API Configuration
           API_TITLE=STAC Atlas
           API_DESCRIPTION=A centralized platform for managing, indexing, and providing STAC Collection metadata
-          API_VERSION=1.1.0
+          API_VERSION=1.0.0
           EOF
       
       - name: Install dependencies
@@ -230,7 +230,7 @@ jobs:
           # API Configuration
           API_TITLE=STAC Atlas
           API_DESCRIPTION=A centralized platform for managing, indexing, and providing STAC Collection metadata
-          API_VERSION=1.1.0
+          API_VERSION=1.0.0
           EOF
 
       - name: Install Node dependencies
@@ -269,8 +269,7 @@ jobs:
             --root-url "http://localhost:3000/" \
             --conformance core \
             --conformance collections \
-            --collection 1 \
-            --verbose | tee stac-validator-output.txt
+            --collection africa-agriculture-adaptation-atlas_extreme_hazard_risk_annual \
 
       - name: Upload validator output
         uses: actions/upload-artifact@v4

api/.env.example

@@ -24,8 +24,12 @@ DB_CONNECTION_TIMEOUT=10000
 
 # CORS Configuration
 CORS_ORIGIN=*
+CORS_CREDENTIALS=false
+
+# Logging Configuration
+LOG_LEVEL=debug
 
 # API Configuration
 API_TITLE=STAC Atlas
 API_DESCRIPTION=A centralized platform for managing, indexing, and providing STAC Collection metadata
-API_VERSION=1.1.0
+API_VERSION=1.0.0

api/README.md

@@ -198,7 +198,7 @@ CORS_ORIGIN=*
 
 This API implements:
 
-- ✅ STAC API Core (v1.1.0)
+- ✅ STAC API Core (v1.0.0)
 - ✅ OGC API Features Core
 - ✅ STAC Collections
 - ✅ Collection Search Extension

api/__tests__/DBconnection.test.js

@@ -1,5 +1,5 @@
 const { testConnection, queryByBBox, queryByGeometry, queryByDistance, closePool } = require('../db/db_APIconnection');
-
+const { query } = require('../db/db_APIconnection');
 /**
  * Jest Test Suite: Database Connection & PostGIS Tests
  */
@@ -23,20 +23,22 @@ describe('Database Connection', () => {
 
   describe('PostGIS - BBox Query', () => {
     test('should execute BBox query', async () => {
-      const result = await queryByBBox('collection', [-180, -90, 180, 90]);
-      
-      expect(result).toBeDefined();
-      expect(result.rows).toBeDefined();
-    });
+      const result = await queryByBBox('collection', [-80, -60, 80, 60]);
+      expect(result.rowCount).toBeGreaterThanOrEqual(0);
+    }, 45000);
 
     test('should return collections within bbox', async () => {
-      const result = await queryByBBox('collection', [-180, -90, 180, 90]);
-      
+      const result = await queryByBBox('collection', [-80, -60, 80, 60]);
+
+      // query worked and returned structure
+      expect(Array.isArray(result.rows)).toBe(true);
+
+      // if there are results, they should have spatial_extent property
       if (result.rowCount > 0) {
-        expect(result.rows[0]).toHaveProperty('spatial_extend');
-        expect(result.rowCount).toBeGreaterThan(0);
+        expect(result.rows[0]).toHaveProperty('spatial_extent');
       }
-    });
+    }, 45000);
+  });
 
     test('should reject invalid longitude', async () => {
       await expect(
@@ -76,7 +78,7 @@ describe('Database Connection', () => {
       expect(result.rows).toBeDefined();
     });
 
-    test('should return spatial_extend column', async () => {
+    test('should return spatial_extent column', async () => {
       const point = {
         type: 'Point',
         coordinates: [0, 0]
@@ -85,7 +87,7 @@ describe('Database Connection', () => {
       const result = await queryByGeometry('collection', point, 'intersects');
 
       if (result.rowCount > 0) {
-        expect(result.rows[0]).toHaveProperty('spatial_extend');
+        expect(result.rows[0]).toHaveProperty('spatial_extent');
       }
     });
 
@@ -131,7 +133,7 @@ describe('Database Connection', () => {
 
       if (result.rowCount > 0) {
         expect(result.rows[0]).toHaveProperty('distance');
-        expect(result.rows[0]).toHaveProperty('spatial_extend');
+        expect(result.rows[0]).toHaveProperty('spatial_extent');
       }
     });
 
@@ -163,4 +165,4 @@ describe('Database Connection', () => {
       expect(result2).toBeDefined();
     });
   });
-});
+

api/__tests__/api.test.js

@@ -74,33 +74,33 @@ describe('STAC API Core Endpoints', () => {
       it('should return a STAC Collections response', async () => {
       const response = await request(app).get('/collections').expect(200);
 
-      
       expect(response.body).toHaveProperty('collections');
       expect(response.body).toHaveProperty('links');
       expect(Array.isArray(response.body.collections)).toBe(true);
       expect(Array.isArray(response.body.links)).toBe(true);
     });
 
       it('should include required link relations', async () => {
-   const response = await request(app).get('/collections').expect(200);
-    const rels = response.body.links.map(l => l.rel);
-    expect(rels).toContain('self');
-    expect(rels).toContain('root');
-	  expect(rels).toContain('parent');
-  });
-  });
+      const response = await request(app).get('/collections').expect(200);
+      const rels = response.body.links.map(l => l.rel);
+        
+      expect(rels).toContain('self');
+      expect(rels).toContain('root');
+      expect(rels).toContain('parent');
+    });
+    });
 
-  describe('GET /queryables', () => {
+  describe('GET /collections-queryables', () => {
     it('should return queryables schema', async () => {
-      const response = await request(app).get('/queryables').expect(200);
+      const response = await request(app).get('/collections-queryables').expect(200);
 
       expect(response.body).toHaveProperty('$schema');
       expect(response.body).toHaveProperty('type', 'object');
       expect(response.body).toHaveProperty('properties');
     });
 
     it('should include standard STAC queryable fields', async () => {
-      const response = await request(app).get('/queryables').expect(200);
+      const response = await request(app).get('/collections-queryables').expect(200);
 
       const properties = response.body.properties;
       expect(properties).toHaveProperty('id');

api/__tests__/buildCollectionSearchQuery.aggregates.test.js

@@ -11,9 +11,9 @@ describe('buildCollectionSearchQuery - aggregated fields', () => {
     expect(sql).toMatch(/c\.title/);
     expect(sql).toMatch(/c\.description/);
     expect(sql).toMatch(/c\.license/);
-    expect(sql).toMatch(/c\.spatial_extend/);
-    expect(sql).toMatch(/c\.temporal_extend_start/);
-    expect(sql).toMatch(/c\.temporal_extend_end/);
+    expect(sql).toMatch(/c\.spatial_extent/);
+    expect(sql).toMatch(/c\.temporal_extent_start/);
+    expect(sql).toMatch(/c\.temporal_extent_end/);
     expect(sql).toMatch(/c\.created_at/);
     expect(sql).toMatch(/c\.updated_at/);
     expect(sql).toMatch(/c\.is_api/);
@@ -104,37 +104,36 @@ describe('buildCollectionSearchQuery - aggregated fields', () => {
   });
 
   describe('WHERE clauses use collection alias c', () => {
-    test('bbox filter uses c.spatial_extend', () => {
+    test('bbox filter uses c.spatial_extent', () => {
       const bbox = [-10, 40, 10, 50];
       const { sql } = buildCollectionSearchQuery({ bbox, limit: 10, token: 0 });
 
-      expect(sql).toMatch(/c\.spatial_extend/);
-      expect(sql).toMatch(/ST_Intersects\(\s*c\.spatial_extend/);
+      expect(sql).toMatch(/c\.spatial_extent/);
+      expect(sql).toMatch(/ST_Intersects\(\s*c\.spatial_extent/);
     });
 
-    test('datetime filter uses c.temporal_extend_start and c.temporal_extend_end', () => {
+    test('datetime filter uses c.temporal_extent_start and c.temporal_extent_end', () => {
       const datetime = '2020-01-01/2021-12-31';
       const { sql } = buildCollectionSearchQuery({ datetime, limit: 10, token: 0 });
 
-      expect(sql).toMatch(/c\.temporal_extend_end >= \$/);
-      expect(sql).toMatch(/c\.temporal_extend_start <= \$/);
+      expect(sql).toMatch(/c\.temporal_extent_end >= \$/);
+      expect(sql).toMatch(/c\.temporal_extent_start <= \$/);
     });
 
     test('fulltext search uses c.title and c.description', () => {
       const q = 'satellite';
       const { sql } = buildCollectionSearchQuery({ q, limit: 10, token: 0 });
 
-      expect(sql).toMatch(/coalesce\(c\.title,''\)/);
-      expect(sql).toMatch(/coalesce\(c\.description,''\)/);
-      expect(sql).toMatch(/to_tsvector\('simple', coalesce\(c\.title,''\) \|\| ' ' \|\| coalesce\(c\.description,''\)\)/);
+      expect(sql).toMatch(/c\.search_vector\s*@@\s*plainto_tsquery\('simple', \$1\)/);
+      expect(sql).toMatch(/ts_rank_cd\(c\.search_vector,\s*plainto_tsquery\('simple', \$1\)\)\s+AS\s+rank/);
     });
   });
 
   describe('ORDER BY uses collection alias c', () => {
-    test('default ORDER BY uses c.id', () => {
+    test('default ORDER BY uses c.stac_id', () => {
       const { sql } = buildCollectionSearchQuery({ limit: 10, token: 0 });
 
-      expect(sql).toMatch(/ORDER BY c\.id ASC/);
+      expect(sql).toMatch(/ORDER BY c\.stac_id ASC/);
     });
 
     test('sortby parameter uses c. prefix', () => {
@@ -144,11 +143,11 @@ describe('buildCollectionSearchQuery - aggregated fields', () => {
       expect(sql).toMatch(/ORDER BY c\.title DESC/);
     });
 
-    test('fulltext search with rank orders by rank DESC, c.id ASC', () => {
+    test('fulltext search with rank orders by rank DESC, c.stac_id ASC', () => {
       const q = 'satellite';
       const { sql } = buildCollectionSearchQuery({ q, limit: 10, token: 0 });
 
-      expect(sql).toMatch(/ORDER BY rank DESC, c\.id ASC/);
+      expect(sql).toMatch(/ORDER BY rank DESC, c\.stac_id ASC/);
     });
   });
 

api/__tests__/buildCollectionSearchQuery.fulltext.test.js

@@ -13,7 +13,7 @@ describe('buildCollectionSearchQuery - full-text search and ranking', () => {
     expect(sql).toMatch(/AS rank/);
 
     // Ordering defaults to rank DESC when q present and no sortby
-    expect(sql).toMatch(/ORDER BY rank DESC, c\.id ASC/);
+    expect(sql).toMatch(/ORDER BY rank DESC, c\.stac_id ASC/);
 
     // values: [q, limit, token]
     expect(values[0]).toBe('forest');

api/__tests__/buildCollectionSearchQuery.integration.test.js

@@ -36,7 +36,7 @@ describe('Integration: Collection Search with Aggregated Fields', () => {
         const firstRow = result.rows[0];
 
         // Core collection fields
-        expect(firstRow).toHaveProperty('id');
+        expect(firstRow).toHaveProperty('stac_id');
         expect(firstRow).toHaveProperty('title');
         expect(firstRow).toHaveProperty('description');
         expect(firstRow).toHaveProperty('license');
@@ -218,14 +218,17 @@ describe('Integration: Collection Search with Aggregated Fields', () => {
   });
 
   describe('Sorting with Aggregated Fields', () => {
-    test('default sort by c.id works with aggregated fields', async () => {
+    test('default sort by c.stac_id works with aggregated fields', async () => {
       const { sql, values } = buildCollectionSearchQuery({ limit: 10, token: 0 });
       const result = await query(sql, values);
 
+      // Verify SQL contains ORDER BY c.stac_id ASC
+      expect(sql).toMatch(/ORDER BY c\.stac_id ASC/);
+
       if (result.rows.length > 1) {
-        // IDs should be in ascending order
+        // STAC IDs should be in ascending lexicographic order (string comparison)
         for (let i = 1; i < result.rows.length; i++) {
-          expect(result.rows[i].id).toBeGreaterThanOrEqual(result.rows[i - 1].id);
+          expect(result.rows[i].stac_id.localeCompare(result.rows[i - 1].stac_id)).toBeGreaterThanOrEqual(0);
         }
       }
     });
@@ -268,7 +271,7 @@ describe('Integration: Collection Search with Aggregated Fields', () => {
 
       expect(result.rows.length).toBeLessThanOrEqual(3);
       result.rows.forEach(row => {
-        expect(row).toHaveProperty('id');
+        expect(row).toHaveProperty('stac_id');
         expect(row).toHaveProperty('keywords');
         expect(row).toHaveProperty('providers');
       });
@@ -280,8 +283,8 @@ describe('Integration: Collection Search with Aggregated Fields', () => {
 
       if (page1.rows.length > 0 && page2.rows.length > 0) {
         // IDs should be different
-        const page1Ids = page1.rows.map(r => r.id);
-        const page2Ids = page2.rows.map(r => r.id);
+        const page1Ids = page1.rows.map(r => r.stac_id);
+        const page2Ids = page2.rows.map(r => r.stac_id);
 
         const overlap = page1Ids.filter(id => page2Ids.includes(id));
         expect(overlap.length).toBe(0);
@@ -302,7 +305,7 @@ describe('Integration: Collection Search with Aggregated Fields', () => {
       const result = await query(sql, values);
 
       // Collect all IDs
-      const ids = result.rows.map(r => r.id);
+      const ids = result.rows.map(r => r.stac_id);
       const uniqueIds = [...new Set(ids)];
 
       // No duplicates: each collection should appear exactly once

api/__tests__/buildCollectionsSearchQuery.basic.test.js

@@ -5,7 +5,7 @@ describe('buildCollectionSearchQuery - basic cases', () => {
     const { sql, values } = buildCollectionSearchQuery({ limit: 10, token: 0 });
 
     expect(sql).toMatch(/FROM collection c/);
-    expect(sql).toMatch(/ORDER BY c\.id ASC/);
+    expect(sql).toMatch(/ORDER BY c\.stac_id ASC/);
     // there should be LIMIT and OFFSET placeholders
     expect(sql).toMatch(/LIMIT \$1 OFFSET \$2/);
     expect(Array.isArray(values)).toBe(true);
@@ -30,8 +30,8 @@ describe('buildCollectionSearchQuery - basic cases', () => {
     const datetime = '2020-01-01/2021-12-31';
     const { sql, values } = buildCollectionSearchQuery({ datetime, limit: 10, token: 0 });
 
-    expect(sql).toMatch(/c\.temporal_extend_end >= \$1/); // TODO: Adjust naming to temporal_extent_end, when DB names are updated
-    expect(sql).toMatch(/c\.temporal_extend_start <= \$2/); // TODO: Adjust naming to temporal_extent_start, when DB names are updated
+    expect(sql).toMatch(/c\.temporal_extent_end >= \$1/);
+    expect(sql).toMatch(/c\.temporal_extent_start <= \$2/);
     // values order: start, end, limit, token
     expect(values[0]).toBe('2020-01-01');
     expect(values[1]).toBe('2021-12-31');

api/__tests__/collections-queryables.test.js

@@ -0,0 +1,35 @@
+const request = require('supertest');
+const app = require('../app');
+
+describe('GET /collections-queryables', () => {
+  it('returns queryables as JSON Schema', async () => {
+    const res = await request(app).get('/collections-queryables');
+
+    expect(res.status).toBe(200);
+
+    // content type should be schema+json (may include charset)
+    expect(res.headers['content-type']).toMatch(/application\/schema\+json/);
+
+    // basic JSON Schema structure
+    expect(res.body).toHaveProperty('$schema');
+    expect(res.body).toHaveProperty('$id');
+    expect(res.body).toHaveProperty('type', 'object');
+    expect(res.body).toHaveProperty('properties');
+
+    // required properties from bid/schema
+    expect(res.body.properties).toHaveProperty('id');
+    expect(res.body.properties).toHaveProperty('title');
+    expect(res.body.properties).toHaveProperty('description');
+    expect(res.body.properties).toHaveProperty('license');
+    expect(res.body.properties).toHaveProperty('keywords');
+    expect(res.body.properties).toHaveProperty('providers');
+    expect(res.body.properties).toHaveProperty('stac_extensions');
+
+    // spatial/temporal queryables
+    expect(res.body.properties).toHaveProperty('spatial_extent');
+
+    // operators documented (vendor extension)
+    expect(res.body.properties.id).toHaveProperty('x-ogc-operators');
+    expect(Array.isArray(res.body.properties.id['x-ogc-operators'])).toBe(true);
+  });
+});