fix (wip)

This commit is contained in:
2025-10-26 22:35:52 +01:00
parent 6224e63fa9
commit 9406ffda01
7 changed files with 52 additions and 19 deletions

View File

@@ -87,7 +87,7 @@ func unauthorized(w http.ResponseWriter, r *http.Request) {
}
func ok(o interface{}, w http.ResponseWriter, r *http.Request) {
payload := obj.HTTPObject{
payload := obj.HTTPObject[any]{
HTTPCore: obj.HTTPCore{
Status: http.StatusOK,
Path: r.RequestURI,

View File

@@ -227,13 +227,13 @@ func (r *Repository) Update(pr project.Project) error {
func (r *Repository) List() ([]project.Project, error) {
var prs []project.Project
rows, err := r.db.Query("SELECT uuid, name WHERE Projects")
rows, err := r.db.Query("SELECT uuid, name FROM Projects")
if err != nil {
return nil, fmt.Errorf("failed to get the list of projects: %w", err)
}
defer rows.Close()
stmt, err := r.db.Prepare("SELECT name, schedule, source, destination FROM Repositories WHERE uuid = ?")
stmt, err := r.db.Prepare("SELECT name, schedule, source, destination FROM Repositories WHERE project = ?")
if err != nil {
return nil, fmt.Errorf("invalid syntax: %w", err)
}
@@ -244,18 +244,21 @@ func (r *Repository) List() ([]project.Project, error) {
return nil, fmt.Errorf("failed to scan project name: %w", err)
}
for rows.Next() {
repoRows, err := stmt.Query(prUUID)
if err != nil {
return nil, fmt.Errorf("failed to query repositories for the project %s: %w", prUUID, err)
}
for repoRows.Next() {
var repo project.Repository
rows, err := stmt.Query(prUUID)
if err != nil {
return nil, fmt.Errorf("failed to get the list of projects: %w", err)
}
if err := rows.Scan(&repo.Name, &repo.Schedule, &repo.Source, &repo.Destination); err != nil {
if err := repoRows.Scan(&repo.Name, &repo.Schedule, &repo.Source, &repo.Destination); err != nil {
repoRows.Close()
return nil, fmt.Errorf("failed to scan repository entry: %w", err)
}
pr.Repositories = append(pr.Repositories, repo)
}
repoRows.Close()
prs = append(prs, pr)
}