add question process

Author: haozibi

app/card.go

@@ -0,0 +1,59 @@
+package app
+
+import (
+	"net/http"
+	"time"
+
+	"github.com/haozibi/leetcode-badge/internal/card"
+	"github.com/haozibi/leetcode-badge/internal/leetcodecn"
+	"github.com/pkg/errors"
+)
+
+func (a *APP) getCard(badgeType BadgeType, name string, r *http.Request) ([]byte, error) {
+
+	var f func(string, *http.Request) ([]byte, error)
+	switch badgeType {
+	case BadgeTypeQuestionProcessCard:
+		f = a.getQuestionProcess
+	default:
+		return nil, errors.Errorf("not found card function")
+	}
+
+	query := r.URL.Query().Encode()
+	key := badgeType.String() + "_" + name + query
+
+	body, err := a.cache.GetByteBody(key)
+	if err == nil && len(body) != 0 {
+		return body, nil
+	}
+	fn := func() (interface{}, error) {
+		body, err := f(name, r)
+		if err != nil {
+			return nil, err
+		}
+
+		err = a.cache.SaveByteBody(key, body, 5*time.Minute)
+		return body, err
+	}
+
+	result, err, _ := a.group.Do(key, fn)
+	if err != nil {
+		return nil, err
+	}
+
+	return result.([]byte), nil
+}
+
+func (a *APP) getQuestionProcess(name string, r *http.Request) ([]byte, error) {
+	data, err := leetcodecn.GetUserQuestionProgress(name)
+	if err != nil {
+		return nil, err
+
+	}
+	if data == nil {
+		return nil, ErrUserNotSupport
+	}
+
+	body, err := card.Build(data)
+	return body, err
+}

app/chart.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 
 	"github.com/haozibi/leetcode-badge/internal/chart"
 	"github.com/haozibi/leetcode-badge/internal/heatmap"
@@ -121,31 +120,6 @@ func (a *APP) getHistoryList(name string, isCN bool, start, end time.Time) ([]st
 	return result.([]storage.HistoryRecord), nil
 }
 
-// SubCal SubmissionCalendar
-func (a *APP) SubCal(_ BadgeType, name string, isCN bool, w http.ResponseWriter, r *http.Request) {
-	if !isCN {
-		w.WriteHeader(http.StatusNotFound)
-		w.Write([]byte("404 not found"))
-		return
-	}
-
-	body, err := a.getSubCal(name, r)
-	if err != nil {
-		if err == ErrUserNotSupport {
-			a.write(w, statics.SVGNotFound())
-		} else {
-			log.Err(err).
-				Str("Name", name).
-				Bool("IsCN", isCN).
-				Msg("get subcal error")
-			w.WriteHeader(http.StatusInternalServerError)
-		}
-		return
-	}
-
-	a.write(w, body)
-}
-
 func (a *APP) getSubCal(name string, r *http.Request) ([]byte, error) {
 	var (
 		query = r.URL.Query().Encode()

app/http.go

@@ -6,6 +6,7 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/haozibi/leetcode-badge/internal/statics"
 	"github.com/rs/zerolog/log"
 )
 
@@ -69,6 +70,55 @@ func (a *APP) Basic(badgeType BadgeType, name string, isCN bool, w http.Response
 	a.write(w, body)
 }
 
+// SubCal SubmissionCalendar
+func (a *APP) SubCal(_ BadgeType, name string, isCN bool, w http.ResponseWriter, r *http.Request) {
+	if !isCN {
+		w.WriteHeader(http.StatusNotFound)
+		w.Write([]byte("404 not found"))
+		return
+	}
+
+	body, err := a.getSubCal(name, r)
+	if err != nil {
+		if err == ErrUserNotSupport {
+			a.write(w, statics.SVGNotFound())
+		} else {
+			log.Err(err).
+				Str("Name", name).
+				Bool("IsCN", isCN).
+				Msg("get subcal error")
+			w.WriteHeader(http.StatusInternalServerError)
+		}
+		return
+	}
+
+	a.write(w, body)
+}
+
+func (a *APP) Card(badgeType BadgeType, name string, isCN bool, w http.ResponseWriter, r *http.Request) {
+	if !isCN {
+		w.WriteHeader(http.StatusNotFound)
+		w.Write([]byte("404 not found"))
+		return
+	}
+
+	body, err := a.getCard(badgeType, name, r)
+	if err != nil {
+		if err == ErrUserNotSupport {
+			a.write(w, statics.SVGNotFound())
+		} else {
+			log.Err(err).
+				Str("Name", name).
+				Bool("IsCN", isCN).
+				Msg("get subcal error")
+			w.WriteHeader(http.StatusInternalServerError)
+		}
+		return
+	}
+
+	a.write(w, body)
+}
+
 func (a *APP) Chart(badgeType BadgeType, name string, isCN bool, w http.ResponseWriter, r *http.Request) {
 	day := 7
 	dayStr := r.URL.Query().Get("day")

app/router.go

@@ -74,6 +74,10 @@ func Router(r *mux.Router, a *APP, w io.Writer) {
 			handlers.CombinedLoggingHandler(w, a.HandlerFunc(BadgeTypeChartSubmissionCalendar, isCN)),
 		)
 
+		// [card] 答题进度卡片
+		api.Methods(http.MethodGet).Path("/card/question-process/{name:.+}.svg").Handler(
+			handlers.CombinedLoggingHandler(w, a.HandlerFunc(BadgeTypeQuestionProcessCard, isCN)),
+		)
 		// [basic] 获得个人信息
 		api.Methods(http.MethodGet).Path("/{name:.+}.svg").Handler(
 			handlers.CombinedLoggingHandler(w, a.HandlerFunc(BadgeTypeProfile, isCN)),
@@ -95,6 +99,8 @@ func (a *APP) HandlerFunc(badgeType BadgeType, isCN bool) http.Handler {
 	// 	f = a.Badge
 	case BadgeTypeChartSubmissionCalendar:
 		f = a.SubCal
+	case BadgeTypeQuestionProcessCard:
+		f = a.Card
 	}
 
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

app/types.go

@@ -17,6 +17,7 @@ const (
 	BadgeTypeChartRanking
 	BadgeTypeChartSolved
 	BadgeTypeChartSubmissionCalendar
+	BadgeTypeQuestionProcessCard
 )
 
 func (b BadgeType) String() string {
@@ -45,6 +46,8 @@ func (b BadgeType) String() string {
 		return "followers"
 	case BadgeTypeChartSubmissionCalendar:
 		return "submission-calendar"
+	case BadgeTypeQuestionProcessCard:
+		return "question_process_card"
 	}
 
 	return ""

go.mod

@@ -6,33 +6,35 @@ require (
 	github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b
 	github.com/davecgh/go-spew v1.1.1
 	github.com/go-redis/redis v6.15.6+incompatible
-	github.com/go-sql-driver/mysql v1.4.1
-	github.com/gorilla/handlers v1.4.2
-	github.com/gorilla/mux v1.7.3
+	github.com/go-sql-driver/mysql v1.6.0
+	github.com/gorilla/handlers v1.5.1
+	github.com/gorilla/mux v1.8.0
 	github.com/haozibi/gendry v0.0.0-20181228133255-0e378288a754
-	github.com/jmoiron/sqlx v1.2.0
-	github.com/mattn/go-sqlite3 v1.14.4
+	github.com/jmoiron/sqlx v1.3.5
+	github.com/mattn/go-sqlite3 v1.14.14
 	github.com/nikolaydubina/calendarheatmap v1.7.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
 	github.com/pkg/errors v0.9.1
-	github.com/robfig/cron/v3 v3.0.1-0.20190716002318-e843a09e5b2d
-	github.com/rs/zerolog v1.20.0
-	github.com/spf13/cobra v0.0.5
+	github.com/robfig/cron/v3 v3.0.1
+	github.com/rs/zerolog v1.27.0
+	github.com/spf13/cobra v1.5.0
 	github.com/wcharczuk/go-chart v2.0.2-0.20190910040548-3a7bc5543113+incompatible
-	golang.org/x/image v0.0.0-20200927104501-e162460cd6b5
-	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
+	golang.org/x/image v0.0.0-20220722155232-062f8c9fd539
+	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
 )
 
 require (
 	github.com/blend/go-sdk v2.0.0+incompatible // indirect
+	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/onsi/ginkgo v1.10.2 // indirect
 	github.com/onsi/gomega v1.7.0 // indirect
-	github.com/spf13/pflag v1.0.3 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/testify v1.3.0 // indirect
-	golang.org/x/text v0.3.3 // indirect
-	google.golang.org/appengine v1.6.5 // indirect
+	golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 // indirect
+	golang.org/x/text v0.3.7 // indirect
 	gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 )