Patch surreal id with regex

Signed-off-by: Paolo Di Tommaso <[email protected]>

src/main/groovy/io/seqera/wave/service/persistence/impl/SurrealPersistenceService.groovy

@@ -214,11 +214,15 @@ class SurrealPersistenceService implements PersistenceService {
         final json = surrealDb.getContainerRequest(getAuthorization(), token)
         log.trace "Container request with token '$token' loaded: ${json}"
         final type = new TypeReference<ArrayList<SurrealResult<WaveContainerRecord>>>() {}
-        final data= json ? JacksonHelper.fromJson(json, type) : null
+        final data= json ? JacksonHelper.fromJson(patchSurrealId(json,"wave_request"), type) : null
         final result = data && data[0].result ? data[0].result[0] : null
         return result
     }
 
+    static protected String patchSurrealId(String json, String table) {
+        json.replaceFirst(/"id":\s*"${table}:(\w*)"/) { List<String> it-> /"id":"${it[1]}"/ }
+    }
+
     void createScanRecord(WaveScanRecord scanRecord) {
         final result = surrealDb.insertScanRecord(authorization, scanRecord)
         log.trace "Scan create result=$result"

src/test/groovy/io/seqera/wave/controller/ViewControllerTest.groovy

@@ -197,7 +197,6 @@ class ViewControllerTest extends Specification {
         def token = '12345'
         def container = new WaveContainerRecord(req, data, token, wave, addr, exp)
 
-
         when:
         persistenceService.saveContainerRequest(container)
         and:

src/test/groovy/io/seqera/wave/service/persistence/impl/SurrealPersistenceServiceTest.groovy

@@ -263,29 +263,8 @@ class SurrealPersistenceServiceTest extends Specification implements SurrealDBTe
 
         when:
         def loaded = persistence.loadContainerRequest(TOKEN)
-
         then:
-        verifyAll(loaded) {
-            loaded.id == "wave_request:$request.id" //surrealdb will add table name in front of id
-            loaded.user == request.user
-            loaded.workspaceId == request.workspaceId
-            loaded.containerImage == request.containerImage
-            loaded.containerConfig == request.containerConfig
-            loaded.platform == request.platform
-            loaded.towerEndpoint == request.towerEndpoint
-            loaded.buildRepository == request.buildRepository
-            loaded.cacheRepository == request.cacheRepository
-            loaded.fingerprint == request.fingerprint
-            loaded.sourceImage == request.sourceImage
-            loaded.sourceDigest == request.sourceDigest
-            loaded.waveImage == request.waveImage
-            loaded.waveDigest == request.waveDigest
-            loaded.expiration == request.expiration
-            loaded.buildId == request.buildId
-            loaded.buildNew == request.buildNew
-            loaded.freeze == request.freeze
-            loaded.fusionVersion == request.fusionVersion
-        }
+        loaded == request
 
         // should update the record
         when:
@@ -386,5 +365,12 @@ class SurrealPersistenceServiceTest extends Specification implements SurrealDBTe
         stored == result
     }
 
+    def 'should remove surreal table from json' () {
+        given:
+        def json = /{"id":"wave_request:1234abc", "this":"one", "that":123 }/
+        expect:
+        SurrealPersistenceService.patchSurrealId(json, "wave_request")
+                == /{"id":"1234abc", "this":"one", "that":123 }/
+    }
 
 }