Merge pull request #10 from apprentice3d/develop

fixed the model derivative result target decoding;

Author: apprentice3d

md/api.go

@@ -142,7 +142,7 @@ func translate(path string, params TranslationParams, token string) (result Tran
 
 	decoder := json.NewDecoder(response.Body)
 
-	err = decoder.Decode(&response)
+	err = decoder.Decode(&result)
 
 	return
 }

recap/call.go

@@ -4,14 +4,15 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"io"
 	"io/ioutil"
 	"log"
 	"mime/multipart"
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
+	"time"
+	"math/rand"
 )
 
 func createPhotoScene(path string, name string, formats []string, sceneType string, token string) (scene PhotoScene, err error) {
@@ -74,10 +75,16 @@ func addFileToSceneUsingLink(path string, photoSceneID string, link string, toke
 
 	task := http.Client{}
 
-	params := `photosceneid=` + photoSceneID + `&type=image`
-	params += `&file[0]=` + link
+	//params := `photosceneid=` + photoSceneID + `&type=image`
+	//params += `&file[0]=` + link
+	//
+	//body := strings.NewReader(params)
 
-	body := strings.NewReader(params)
+	body := &bytes.Buffer{}
+	writer := multipart.NewWriter(body)
+	writer.WriteField("photosceneid", photoSceneID)
+	writer.WriteField("type", "image")
+	writer.WriteField("file[0", link)
 
 	req, err := http.NewRequest("POST",
 		path+"/file",
@@ -88,7 +95,7 @@ func addFileToSceneUsingLink(path string, photoSceneID string, link string, toke
 		return
 	}
 
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	req.Header.Set("Content-Type", writer.FormDataContentType())
 	req.Header.Set("Authorization", "Bearer "+token)
 	response, err := task.Do(req)
 	if err != nil {
@@ -122,22 +129,18 @@ func addFileToSceneUsingLink(path string, photoSceneID string, link string, toke
 
 func addFileToSceneUsingFileData(path string, photoSceneID string, data []byte, token string) (result FileUploadingReply, err error) {
 
+	rand.Seed(time.Now().UnixNano())
+
 	body := &bytes.Buffer{}
 	writer := multipart.NewWriter(body)
-	formFile, err := writer.CreateFormFile("file[0]", "datafile")
+	writer.WriteField("photosceneid", photoSceneID)
+	writer.WriteField("type", "image")
+	formFile, err := writer.CreateFormFile("file[0]", "data" + strconv.Itoa(rand.Int()))
 	if err != nil {
 		log.Println(err.Error())
 		return
 	}
-
-	dataContent := bytes.NewReader(data)
-	if _, err = io.Copy(formFile, dataContent); err != nil {
-		log.Println(err.Error())
-		return
-	}
-
-	writer.WriteField("photosceneid", photoSceneID)
-	writer.WriteField("type", "image")
+	formFile.Write(data)
 	writer.Close()
 
 	task := http.Client{}

recap/recap_test.go

@@ -88,6 +88,46 @@ func TestReCapAPIWorkflowUsingRemoteLinks(t *testing.T) {
 		}
 	})
 
+
+	t.Run("Check the result file size for normal size", func(t *testing.T) {
+		response, err := recapAPI.GetSceneResults(scene.ID, testingFormat)
+		if err != nil {
+			t.Error(err.Error())
+		}
+		if len(response.PhotoScene.SceneLink) == 0 {
+			t.Error("The received link is empty")
+		}
+
+		filename := "temp.zip"
+
+		resp, err := http.Get(response.PhotoScene.SceneLink)
+
+		if err != nil {
+			return
+		}
+		defer resp.Body.Close()
+		result, err := os.Create(filename)
+		if err != nil {
+			return
+		}
+		defer result.Close()
+
+		tempFile, err := os.Stat(filename)
+
+		if tempFile.Size() <= 22 {
+			t.Error("The scene was processed, but the result file is abnormally small: ", tempFile.Size())
+		}
+
+		err = os.Remove(filename)
+		if err != nil {
+			t.Error(err.Error())
+		}
+
+		return
+
+	})
+
+
 	t.Run("Delete the scene", func(t *testing.T) {
 		_, err := recapAPI.DeleteScene(scene.ID)
 		if err != nil {
@@ -190,12 +230,50 @@ func TestReCapAPIWorkflowUsingLocalFiles(t *testing.T) {
 		}
 	})
 
-	//t.Run("Delete the scene", func(t *testing.T) {
-	//	_, err := recapAPI.DeleteScene(scene.ID)
-	//	if err != nil {
-	//		t.Fatal(err.Error())
-	//	}
-	//})
+	t.Run("Check the result file size for normal size", func(t *testing.T) {
+		response, err := recapAPI.GetSceneResults(scene.ID, testingFormat)
+		if err != nil {
+			t.Error(err.Error())
+		}
+		if len(response.PhotoScene.SceneLink) == 0 {
+			t.Error("The received link is empty")
+		}
+
+		filename := "temp.zip"
+
+		resp, err := http.Get(response.PhotoScene.SceneLink)
+
+		if err != nil {
+			return
+		}
+		defer resp.Body.Close()
+		result, err := os.Create(filename)
+		if err != nil {
+			return
+		}
+		defer result.Close()
+
+		tempFile, err := os.Stat(filename)
+
+		if tempFile.Size() <= 22 {
+			t.Error("The scene was processed, but the result file is abnormally small: ", tempFile.Size())
+		}
+
+		err = os.Remove(filename)
+		if err != nil {
+			t.Error(err.Error())
+		}
+
+		return
+
+	})
+
+	t.Run("Delete the scene", func(t *testing.T) {
+		_, err := recapAPI.DeleteScene(scene.ID)
+		if err != nil {
+			t.Fatal(err.Error())
+		}
+	})
 
 }
 
@@ -205,13 +283,24 @@ func TestCreatePhotoScene(t *testing.T) {
 	clientID := os.Getenv("FORGE_CLIENT_ID")
 	clientSecret := os.Getenv("FORGE_CLIENT_SECRET")
 	recapAPI := recap.NewAPIWithCredentials(clientID, clientSecret)
+	var sceneID string
 
 	t.Run("Create a scene", func(t *testing.T) {
-		_, err := recapAPI.CreatePhotoScene("testare", nil, "object")
+		response, err := recapAPI.CreatePhotoScene("testare", nil, "object")
 
 		if err != nil {
 			t.Fatalf("Failed to create a photoscene: %s\n", err.Error())
 		}
+
+		sceneID = response.ID
+	})
+
+	t.Run("Delete the test scene", func(t *testing.T) {
+		_, err := recapAPI.DeleteScene(sceneID)
+
+		if err != nil {
+			t.Fatalf("Failed to delete the photoscene: %s\n", err.Error())
+		}
 	})
 
 	t.Run("Check fail on create a scene with empty name", func(t *testing.T) {