From 6def3de9830a486168f43c45d6fa816512d37d7f Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sun, 1 Jan 2023 15:26:58 +0100 Subject: [PATCH] New field added for works to store gradation repository --- api.go | 1 + db.go | 1 + gradation.go | 32 ++++++++++++++++++++++++ ui/src/lib/components/WorkAdmin.svelte | 34 +++++++++++++++++++++++++- ui/src/lib/gradation.js | 19 ++++++++++++++ ui/src/lib/works.js | 3 ++- works.go | 17 +++++++------ 7 files changed, 97 insertions(+), 10 deletions(-) create mode 100644 gradation.go create mode 100644 ui/src/lib/gradation.js diff --git a/api.go b/api.go index a1979d0..62696a3 100644 --- a/api.go +++ b/api.go @@ -54,6 +54,7 @@ func declareAPIRoutes(router *gin.Engine) { declareAPIAdminAsksRoutes(apiAdminRoutes) declareAPIAdminCategoriesRoutes(apiRoutes) declareAPIAuthGradesRoutes(apiAdminRoutes) + declareAPIAdminGradationRoutes(apiAdminRoutes) declareAPIAdminHelpRoutes(apiAdminRoutes) declareAPIAdminQuestionsRoutes(apiAdminRoutes) declareAPIAuthRepositoriesRoutes(apiAdminRoutes) diff --git a/db.go b/db.go index d99acde..becb4a8 100644 --- a/db.go +++ b/db.go @@ -210,6 +210,7 @@ CREATE TABLE IF NOT EXISTS works( description TEXT NOT NULL, tag VARCHAR(255) NOT NULL, submission_URL VARCHAR(255) NULL, + gradation_repo VARCHAR(255) NULL, corrected BOOLEAN NOT NULL DEFAULT FALSE, start_availability TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, end_availability TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, diff --git a/gradation.go b/gradation.go new file mode 100644 index 0000000..8e762e9 --- /dev/null +++ b/gradation.go @@ -0,0 +1,32 @@ +package main + +import ( + "log" + "net/http" + + "github.com/drone/drone-go/drone" + "github.com/gin-gonic/gin" +) + +func declareAPIAdminGradationRoutes(router *gin.RouterGroup) { + router.GET("/gradation_repositories", func(c *gin.Context) { + client := drone.NewClient(droneEndpoint, droneConfig) + result, err := client.RepoList() + if err != nil { + log.Println("Unable to retrieve the repository list:", err.Error()) + c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "Unable to retrieve the repository list."}) + return + } + c.JSON(http.StatusOK, result) + }) + router.POST("/gradation_repositories/sync", func(c *gin.Context) { + client := drone.NewClient(droneEndpoint, droneConfig) + result, err := client.RepoListSync() + if err != nil { + log.Println("Unable to retrieve the repository list:", err.Error()) + c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "Unable to retrieve the repository list."}) + return + } + c.JSON(http.StatusOK, result) + }) +} diff --git a/ui/src/lib/components/WorkAdmin.svelte b/ui/src/lib/components/WorkAdmin.svelte index ca77bd3..580df44 100644 --- a/ui/src/lib/components/WorkAdmin.svelte +++ b/ui/src/lib/components/WorkAdmin.svelte @@ -3,6 +3,7 @@ import { goto } from '$app/navigation'; import { getCategories } from '$lib/categories'; + import { getGradationRepositories, syncGradationRepositories } from '$lib/gradation'; import DateTimeInput from './DateTimeInput.svelte'; import { ToastsStore } from '$lib/stores/toasts'; @@ -39,6 +40,7 @@ }) } + let grepositoriesP = getGradationRepositories();
@@ -109,11 +111,41 @@
-
+
+
+
+ +
+
+ {#await grepositoriesP} + + {:then grepositories} +
+ + +
+ {/await} +
+
+
diff --git a/ui/src/lib/gradation.js b/ui/src/lib/gradation.js new file mode 100644 index 0000000..894a4ad --- /dev/null +++ b/ui/src/lib/gradation.js @@ -0,0 +1,19 @@ +export async function getGradationRepositories() { + let url = '/api/gradation_repositories'; + const res = await fetch(url, {headers: {'Accept': 'application/json'}}) + if (res.status == 200) { + return await res.json(); + } else { + throw new Error((await res.json()).errmsg); + } +} + +export async function syncGradationRepositories() { + let url = '/api/gradation_repositories/sync'; + const res = await fetch(url, {method: 'post', headers: {'Accept': 'application/json'}}) + if (res.status == 200) { + return await res.json(); + } else { + throw new Error((await res.json()).errmsg); + } +} diff --git a/ui/src/lib/works.js b/ui/src/lib/works.js index c926927..df100d8 100644 --- a/ui/src/lib/works.js +++ b/ui/src/lib/works.js @@ -6,7 +6,7 @@ export class Work { } } - update({ id, id_category, title, promo, group, shown, tag, description, descr_raw, submission_url, corrected, start_availability, end_availability }) { + update({ id, id_category, title, promo, group, shown, tag, description, descr_raw, submission_url, gradation_repo, corrected, start_availability, end_availability }) { this.id = id; this.id_category = id_category; this.title = title; @@ -17,6 +17,7 @@ export class Work { this.description = description; this.descr_raw = descr_raw; this.submission_url = submission_url; + this.gradation_repo = gradation_repo; this.corrected = corrected; if (this.start_availability != start_availability) { this.start_availability = start_availability; diff --git a/works.go b/works.go index 08f5617..b60bcbf 100644 --- a/works.go +++ b/works.go @@ -108,7 +108,7 @@ func declareAPIAdminWorksRoutes(router *gin.RouterGroup) { new.Promo = currentPromo } - work, err := NewWork(new.IdCategory, new.Title, new.Promo, new.Group, new.Shown, new.DescriptionRaw, new.Tag, new.SubmissionURL, new.StartAvailability, new.EndAvailability) + work, err := NewWork(new.IdCategory, new.Title, new.Promo, new.Group, new.Shown, new.DescriptionRaw, new.Tag, new.SubmissionURL, new.GradationRepo, new.StartAvailability, new.EndAvailability) if err != nil { log.Println("Unable to NewWork:", err) c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"errmsg": "An error occurs during work creation"}) @@ -304,20 +304,21 @@ type Work struct { DescriptionRaw string `json:"descr_raw,omitempty"` Tag string `json:"tag,omitempty"` SubmissionURL *string `json:"submission_url,omitempty"` + GradationRepo *string `json:"gradation_repo"` Corrected bool `json:"corrected,omitempty"` StartAvailability time.Time `json:"start_availability"` EndAvailability time.Time `json:"end_availability"` } func getWorks(cnd string, param ...interface{}) (items []*Work, err error) { - if rows, errr := DBQuery("SELECT id_work, id_category, title, promo, grp, shown, description, tag, submission_url, corrected, start_availability, end_availability FROM works "+cnd, param...); errr != nil { + if rows, errr := DBQuery("SELECT id_work, id_category, title, promo, grp, shown, description, tag, submission_url, gradation_repo, corrected, start_availability, end_availability FROM works "+cnd, param...); errr != nil { return nil, errr } else { defer rows.Close() for rows.Next() { var w Work - if err = rows.Scan(&w.Id, &w.IdCategory, &w.Title, &w.Promo, &w.Group, &w.Shown, &w.DescriptionRaw, &w.Tag, &w.SubmissionURL, &w.Corrected, &w.StartAvailability, &w.EndAvailability); err != nil { + if err = rows.Scan(&w.Id, &w.IdCategory, &w.Title, &w.Promo, &w.Group, &w.Shown, &w.DescriptionRaw, &w.Tag, &w.SubmissionURL, &w.GradationRepo, &w.Corrected, &w.StartAvailability, &w.EndAvailability); err != nil { return } items = append(items, &w) @@ -332,23 +333,23 @@ func getWorks(cnd string, param ...interface{}) (items []*Work, err error) { func getWork(id int) (w *Work, err error) { w = new(Work) - err = DBQueryRow("SELECT id_work, id_category, title, promo, grp, shown, description, tag, submission_url, corrected, start_availability, end_availability FROM works WHERE id_work=?", id).Scan(&w.Id, &w.IdCategory, &w.Title, &w.Promo, &w.Group, &w.Shown, &w.DescriptionRaw, &w.Tag, &w.SubmissionURL, &w.Corrected, &w.StartAvailability, &w.EndAvailability) + err = DBQueryRow("SELECT id_work, id_category, title, promo, grp, shown, description, tag, submission_url, gradation_repo, corrected, start_availability, end_availability FROM works WHERE id_work=?", id).Scan(&w.Id, &w.IdCategory, &w.Title, &w.Promo, &w.Group, &w.Shown, &w.DescriptionRaw, &w.Tag, &w.SubmissionURL, &w.GradationRepo, &w.Corrected, &w.StartAvailability, &w.EndAvailability) w.Description = string(blackfriday.Run([]byte(w.DescriptionRaw))) return } -func NewWork(id_category int64, title string, promo uint, group string, shown bool, description string, tag string, submissionurl *string, startAvailability time.Time, endAvailability time.Time) (*Work, error) { - if res, err := DBExec("INSERT INTO works (id_category, title, promo, grp, shown, description, tag, submission_url, start_availability, end_availability) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", id_category, title, promo, group, shown, description, tag, submissionurl, startAvailability, endAvailability); err != nil { +func NewWork(id_category int64, title string, promo uint, group string, shown bool, description string, tag string, submissionurl *string, gradation_repo *string, startAvailability time.Time, endAvailability time.Time) (*Work, error) { + if res, err := DBExec("INSERT INTO works (id_category, title, promo, grp, shown, description, tag, submission_url, gradation_repo, start_availability, end_availability) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", id_category, title, promo, group, shown, description, tag, submissionurl, gradation_repo, startAvailability, endAvailability); err != nil { return nil, err } else if wid, err := res.LastInsertId(); err != nil { return nil, err } else { - return &Work{wid, id_category, title, promo, group, shown, description, description, tag, submissionurl, false, startAvailability, endAvailability}, nil + return &Work{wid, id_category, title, promo, group, shown, description, description, tag, submissionurl, gradation_repo, false, startAvailability, endAvailability}, nil } } func (w *Work) Update() (*Work, error) { - if _, err := DBExec("UPDATE works SET id_category = ?, title = ?, promo = ?, grp = ?, shown = ?, description = ?, tag = ?, submission_url = ?, corrected = ?, start_availability = ?, end_availability = ? WHERE id_work = ?", w.IdCategory, w.Title, w.Promo, w.Group, w.Shown, w.DescriptionRaw, w.Tag, w.SubmissionURL, w.Corrected, w.StartAvailability, w.EndAvailability, w.Id); err != nil { + if _, err := DBExec("UPDATE works SET id_category = ?, title = ?, promo = ?, grp = ?, shown = ?, description = ?, tag = ?, submission_url = ?, gradation_repo = ?, corrected = ?, start_availability = ?, end_availability = ? WHERE id_work = ?", w.IdCategory, w.Title, w.Promo, w.Group, w.Shown, w.DescriptionRaw, w.Tag, w.SubmissionURL, w.GradationRepo, w.Corrected, w.StartAvailability, w.EndAvailability, w.Id); err != nil { return nil, err } else { w.Description = string(blackfriday.Run([]byte(w.DescriptionRaw)))