From 5c6515752d94bacb9be27a0abab4772fb083c352 Mon Sep 17 00:00:00 2001
From: "davila.erdianita.1005" <davila.erdianita.1005@rssa.id>
Date: Fri, 12 Sep 2025 13:14:11 +0700
Subject: [PATCH] perubahan response ekstrakhasil

---
 pkg/handlers/mikrobiologi/mikrobiologi.go     |  2 +-
 pkg/handlers/mikrobiologi/response.go         | 18 ++++++++++++------
 pkg/models/simrs/mikrobiologi/mikrobiologi.go |  3 ++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkg/handlers/mikrobiologi/mikrobiologi.go b/pkg/handlers/mikrobiologi/mikrobiologi.go
index 9056013..f010319 100644
--- a/pkg/handlers/mikrobiologi/mikrobiologi.go
+++ b/pkg/handlers/mikrobiologi/mikrobiologi.go
@@ -245,6 +245,6 @@ func EkstrakHasil(c *gin.Context) {
 		})
 		return
 	}
-	log.Println(resEkstrakHasil)
+	//log.Println(resEkstrakHasil)
 	c.JSON(http.StatusOK, resEkstrakHasil)
 }
diff --git a/pkg/handlers/mikrobiologi/response.go b/pkg/handlers/mikrobiologi/response.go
index dafd2c9..3e8e3a2 100644
--- a/pkg/handlers/mikrobiologi/response.go
+++ b/pkg/handlers/mikrobiologi/response.go
@@ -85,12 +85,12 @@ func SendLisMikro(request *mikrobiologi.RequestLISMikro) (*mikrobiologi.Response
 	return responses, nil
 }
 
-func EkstrakHasilLis(request mikrobiologi.RequestEkstrakhasil) ([]*mikrobiologi.RawDataEkstrakHasil, error) {
+func EkstrakHasilLis(request mikrobiologi.RequestEkstrakhasil) (*mikrobiologi.EkstrakHasil, error) {
 	baseUrl := os.Getenv("LIS_MIKROBIOLOGI_URL")
 	endpoint := os.Getenv("LIS_EKSTRAKHASIL")
 
 	url := baseUrl + endpoint
-	log.Println("URL", url)
+	//log.Println("URL", url)
 
 	reqMarshall, err := json.Marshal(request)
 	if err != nil {
@@ -143,14 +143,14 @@ func EkstrakHasilLis(request mikrobiologi.RequestEkstrakhasil) ([]*mikrobiologi.
 
 	var responses mikrobiologi.ResponseEkstrak
 
-	log.Println("RESPONSE: ", string(res))
+	//log.Println("RESPONSE res: ", string(res))
 
 	err = json.Unmarshal(res, &responses)
 	if err != nil {
 		log.Printf("Error unmarshalling response: %v", err)
 		return nil, err
 	}
-	log.Println("RESPONSE: ", responses)
+	//log.Println("RESPONSE unmarshal: ", responses)
 	var rawData []*mikrobiologi.RawDataEkstrakHasil
 	err = json.Unmarshal([]byte(responses.RawData), &rawData)
 	if err != nil {
@@ -158,6 +158,12 @@ func EkstrakHasilLis(request mikrobiologi.RequestEkstrakhasil) ([]*mikrobiologi.
 		return nil, err
 	}
 
-	log.Println("RESPONSE ekstrak hasil: ", rawData)
-	return rawData, nil
+	hasil := &mikrobiologi.EkstrakHasil{
+		HtmlLink: responses.HtmlLink,
+		Html:     responses.Html,
+		RawData:  rawData,
+	}
+
+	//log.Println("RESPONSE ekstrak hasil: ", rawData)
+	return hasil, nil
 }
diff --git a/pkg/models/simrs/mikrobiologi/mikrobiologi.go b/pkg/models/simrs/mikrobiologi/mikrobiologi.go
index 5317219..000beaf 100644
--- a/pkg/models/simrs/mikrobiologi/mikrobiologi.go
+++ b/pkg/models/simrs/mikrobiologi/mikrobiologi.go
@@ -169,7 +169,7 @@ type RequestEkstrakhasil struct {
 }
 
 type ResponseEkstrak struct {
-	HtmlLink string `json:"htmllink"`
+	HtmlLink string `json:"htmlink"`
 	Html     string `json:"html"`
 	RawData  string `json:"rawdata"`
 }
@@ -186,5 +186,6 @@ type RawDataEkstrakHasil struct {
 
 type EkstrakHasil struct {
 	HtmlLink string                 `json:"htmllink"`
+	Html     string                 `json:"html"`
 	RawData  []*RawDataEkstrakHasil `json:"rawdata"`
 }