feat: add -a/--all flag to include concluded courses
This commit is contained in:
@@ -31,10 +31,11 @@ type Client struct {
|
||||
FilesOnly bool
|
||||
VideosOnly bool
|
||||
ModuleNumbers bool
|
||||
All bool
|
||||
downloadedFiles map[string]bool
|
||||
}
|
||||
|
||||
func NewClient(httpClient *http.Client, accessToken, courseID string, filesOnly, videosOnly, moduleNumbers bool) *Client {
|
||||
func NewClient(httpClient *http.Client, accessToken, courseID string, filesOnly, videosOnly, moduleNumbers, all bool) *Client {
|
||||
return &Client{
|
||||
HTTPClient: httpClient,
|
||||
AccessToken: accessToken,
|
||||
@@ -42,6 +43,7 @@ func NewClient(httpClient *http.Client, accessToken, courseID string, filesOnly,
|
||||
FilesOnly: filesOnly,
|
||||
VideosOnly: videosOnly,
|
||||
ModuleNumbers: moduleNumbers,
|
||||
All: all,
|
||||
downloadedFiles: make(map[string]bool),
|
||||
}
|
||||
}
|
||||
@@ -66,6 +68,11 @@ func (c *Client) GetCourseInfo() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
type enrollmentResponse struct {
|
||||
CourseID int `json:"course_id"`
|
||||
EnrollmentState string `json:"enrollment_state"`
|
||||
}
|
||||
|
||||
func (c *Client) GetEnrolledCourses() ([]models.Course, error) {
|
||||
req, _ := http.NewRequest("GET", fmt.Sprintf("%s/api/v1/courses?enrollment_state=active&per_page=100", config.BaseURL), nil)
|
||||
req.Header.Set("Authorization", "Bearer "+c.AccessToken)
|
||||
@@ -81,6 +88,50 @@ func (c *Client) GetEnrolledCourses() ([]models.Course, error) {
|
||||
|
||||
var courses []models.Course
|
||||
json.NewDecoder(resp.Body).Decode(&courses)
|
||||
|
||||
if c.All {
|
||||
completed, err := c.getCompletedCourses()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
courses = append(courses, completed...)
|
||||
}
|
||||
|
||||
return courses, nil
|
||||
}
|
||||
|
||||
func (c *Client) getCompletedCourses() ([]models.Course, error) {
|
||||
req, _ := http.NewRequest("GET", fmt.Sprintf("%s/api/v1/users/self/enrollments?state[]=completed&per_page=100", config.BaseURL), nil)
|
||||
req.Header.Set("Authorization", "Bearer "+c.AccessToken)
|
||||
resp, err := c.HTTPClient.Do(req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
if err := checkAPIResponse(resp); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var enrollments []enrollmentResponse
|
||||
json.NewDecoder(resp.Body).Decode(&enrollments)
|
||||
|
||||
var courses []models.Course
|
||||
for _, e := range enrollments {
|
||||
courseReq, _ := http.NewRequest("GET", fmt.Sprintf("%s/api/v1/courses/%d", config.BaseURL, e.CourseID), nil)
|
||||
courseReq.Header.Set("Authorization", "Bearer "+c.AccessToken)
|
||||
courseResp, err := c.HTTPClient.Do(courseReq)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
var course models.Course
|
||||
json.NewDecoder(courseResp.Body).Decode(&course)
|
||||
courseResp.Body.Close()
|
||||
if course.ID != 0 {
|
||||
courses = append(courses, course)
|
||||
}
|
||||
}
|
||||
|
||||
return courses, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user