Add ChallengeNoTrack to avoid Entity Not Found when challenges get re…

…moved

Signed-off-by: Raphaël Pinson <[email protected]>

instruqt/challenge.go

@@ -42,6 +42,15 @@ type Challenge struct {
 	} `json:"-"`
 }
 
+// ChallengeNoTrack represents the data structure for an Instruqt challenge.
+type ChallengeNoTrack struct {
+	Id     string `json:"id"`     // The unique identifier for the challenge.
+	Slug   string `json:"slug"`   // The slug for the challenge, which is a human-readable identifier.
+	Title  string `json:"title"`  // The title of the challenge.
+	Index  int    `json:"index"`  // The index of the challenge in the track.
+	Status string `json:"status"` // The status of the challenge (e.g., "unlocked", "completed").
+}
+
 // GetChallenge retrieves a challenge from Instruqt using its unique challenge ID.
 //
 // Parameters:

instruqt/client.go

@@ -18,9 +18,12 @@ import (
 	"context"
 	"log"
 	"net/http"
+	"net/http/httputil"
 	"os"
 
 	"github.com/shurcooL/graphql"
+
+	loghttp "github.com/motemen/go-loghttp"
 )
 
 // GraphQLClient is an interface that defines the methods for interacting with
@@ -52,8 +55,18 @@ type Client struct {
 func NewClient(token string, teamSlug string) *Client {
 	httpClient := &http.Client{}
 	httpClient.Transport = &BearerTokenRoundTripper{
-		Transport: http.DefaultTransport,
-		Token:     token,
+		Transport: &loghttp.Transport{
+			Transport: httpClient.Transport,
+			LogRequest: func(req *http.Request) {
+				b, _ := httputil.DumpRequestOut(req, true)
+				log.Printf("out body: %s", string(b))
+			},
+			LogResponse: func(resp *http.Response) {
+				b, _ := httputil.DumpResponse(resp, true)
+				log.Printf("in body: %s", string(b))
+			},
+		},
+		Token: token,
 	}
 	return &Client{
 		GraphQLClient: graphql.NewClient("https://play.instruqt.com/graphql", httpClient),

instruqt/track.go

@@ -91,11 +91,11 @@ type SandboxTrack struct {
 		TotalCount int
 		Nodes      []Review
 	}
-	Challenges  []Challenge // A list of challenges associated with the sandbox track.
-	Status      string      // The current status of the sandbox track.
-	Started     time.Time   // The timestamp when the sandbox track was started.
-	Completed   time.Time   // The timestamp when the sandbox track was completed.
-	Participant struct {    // Information about the participant of the sandbox track.
+	Challenges  []ChallengeNoTrack // A list of challenges associated with the sandbox track.
+	Status      string             // The current status of the sandbox track.
+	Started     time.Time          // The timestamp when the sandbox track was started.
+	Completed   time.Time          // The timestamp when the sandbox track was completed.
+	Participant struct {           // Information about the participant of the sandbox track.
 		Id string
 	}
 }
@@ -117,11 +117,11 @@ type SandboxTrackNoReviews struct {
 	TrackTags []struct { // A list of tags associated with the sandbox track.
 		Value string
 	}
-	Challenges  []Challenge // A list of challenges associated with the sandbox track.
-	Status      string      // The current status of the sandbox track.
-	Started     time.Time   // The timestamp when the sandbox track was started.
-	Completed   time.Time   // The timestamp when the sandbox track was completed.
-	Participant struct {    // Information about the participant of the sandbox track.
+	Challenges  []ChallengeNoTrack // A list of challenges associated with the sandbox track.
+	Status      string             // The current status of the sandbox track.
+	Started     time.Time          // The timestamp when the sandbox track was started.
+	Completed   time.Time          // The timestamp when the sandbox track was completed.
+	Participant struct {           // Information about the participant of the sandbox track.
 		Id string
 	}
 }
@@ -216,7 +216,7 @@ func (c *Client) GetTrackBySlug(trackSlug string) (t Track, err error) {
 // Returns:
 //   - Challenge: The first unlocked challenge found.
 //   - error: Any error encountered while retrieving the challenge.
-func (c *Client) GetTrackUnlockedChallenge(userId string, trackId string) (challenge Challenge, err error) {
+func (c *Client) GetTrackUnlockedChallenge(userId string, trackId string) (challenge ChallengeNoTrack, err error) {
 	track, err := c.GetUserTrackById(userId, trackId)
 	if err != nil {
 		return challenge, fmt.Errorf("[instruqt.GetTrackUnlockedChallenge] failed to get user track: %v", err)