Merge pull request #414 from pixlise/feature/em-import-fixes

Feature/em import fixes

Author: pnemere

api/endpoints/memoisation.go

@@ -140,7 +140,7 @@ func PutMemoise(params apiRouter.ApiHandlerGenericParams) error {
 
 	params.Writer.Header().Add("Content-Type", "application/json")
 
-	ts := fmt.Sprintf("%v", timestamp)
+	ts := fmt.Sprintf(`{"timestamp": %v}`, timestamp)
 	params.Writer.Write([]byte(ts))
 
 	return nil

internal/cmd-line-tools/api-integration-test/testMemoisation.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/pixlise/core/v4/core/utils"
@@ -96,7 +97,11 @@ func testMemoisationWrite_WriteReadRead(apiHost string, jwt string) {
 	failIf(status != 200, fmt.Errorf("Unexpected memoisation response! Status %v, body: %v", status, string(body)))
 
 	// We should have a time stamp
-	ts, err := strconv.ParseInt(string(body), 10, 32)
+	bodyStr := string(body)
+	start := "{\"timestamp\": "
+	failIf(!strings.HasPrefix(bodyStr, start), errors.New("Bad memoise PUT body format: "+bodyStr))
+
+	ts, err := strconv.ParseInt(bodyStr[len(start):len(bodyStr)-1], 10, 32)
 	failIf(err != nil, err)
 
 	failIf(ts < 1742956321, fmt.Errorf("Invalid timestamp: %v", ts))