feat(storage): add native PostgreSQL runtime and verified offline application import
Build and publish container images / images (push) Failing after 12m29s
Build and publish container images / images (push) Failing after 12m29s
This commit is contained in:
1 parent
96065d1e89
commit
0ba1dcfef0
243 files changed
+21441
-3090
No files matched your search
@@ -19,13 +19,13 @@ type TaskWorkRevision struct {
|
||||
ChangedMS int64 `json:"changed_ms"`
|
||||
}
|
||||
|
||||
func auditTaskWork(ctx context.Context, tx *sql.Tx, domain, actor, action, reason string, v TaskWork, now time.Time) error {
|
||||
func (s *Store) auditTaskWork(ctx context.Context, tx *sql.Tx, domain, actor, action, reason string, v TaskWork, now time.Time) error {
|
||||
raw, err := json.Marshal(v)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// Legacy sessions acquire a baseline lazily. Never rewrite an earlier audit.
|
||||
query := `INSERT INTO organizer_work_revisions(work_uuid,version,domain_uuid,owner_uuid,action,reason,changed_ms,data) VALUES(?,?,?,?,?,?,?,?)`
|
||||
query := `INSERT INTO organizer_work_revisions(work_uuid,version,domain_uuid,owner_uuid,action,reason,changed_ms,data) VALUES(` + s.sqlParam(1) + `,` + s.sqlParam(2) + `,` + s.sqlParam(3) + `,` + s.sqlParam(4) + `,` + s.sqlParam(5) + `,` + s.sqlParam(6) + `,` + s.sqlParam(7) + `,` + s.sqlParam(8) + `)`
|
||||
if action == "baseline" {
|
||||
query += ` ON CONFLICT(work_uuid,version) DO NOTHING`
|
||||
}
|
||||
@@ -33,7 +33,7 @@ func auditTaskWork(ctx context.Context, tx *sql.Tx, domain, actor, action, reaso
|
||||
return err
|
||||
}
|
||||
|
||||
func correctTaskWork(ctx context.Context, tx *sql.Tx, domain, actor, action, reason string, v, old TaskWork, now time.Time) (TaskWork, error) {
|
||||
func (s *Store) correctTaskWork(ctx context.Context, tx *sql.Tx, domain, actor, action, reason string, v, old TaskWork, now time.Time) (TaskWork, error) {
|
||||
reason = strings.TrimSpace(reason)
|
||||
if reason == "" || len(reason) > 500 || !utf8.ValidString(reason) || strings.ContainsAny(reason, "\x00\r\n") {
|
||||
return v, ErrTaskInvalid
|
||||
@@ -55,7 +55,7 @@ func correctTaskWork(ctx context.Context, tx *sql.Tx, domain, actor, action, rea
|
||||
// Adjacent spans are valid; double-counted elapsed time is not. Scope across
|
||||
// Domains like the existing one-active-session constraint, without disclosing them.
|
||||
var overlap bool
|
||||
err := tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_work_sessions WHERE owner_uuid=? AND uuid<>? AND cancelled_ms=0 AND start_ms<? AND (end_ms=0 OR end_ms>?))`, actor, old.UUID, v.EndMS, v.StartMS).Scan(&overlap)
|
||||
err := tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_work_sessions WHERE owner_uuid=`+s.sqlParam(1)+` AND uuid<>`+s.sqlParam(2)+` AND cancelled_ms=0 AND start_ms<`+s.sqlParam(3)+` AND (end_ms=0 OR end_ms>`+s.sqlParam(4)+`))`, actor, old.UUID, v.EndMS, v.StartMS).Scan(&overlap)
|
||||
if err != nil {
|
||||
return v, err
|
||||
}
|
||||
@@ -67,11 +67,11 @@ func correctTaskWork(ctx context.Context, tx *sql.Tx, domain, actor, action, rea
|
||||
} else {
|
||||
result.CancelledMS = now.UnixMilli()
|
||||
}
|
||||
if err := auditTaskWork(ctx, tx, domain, actor, "baseline", "", old, now); err != nil {
|
||||
if err := s.auditTaskWork(ctx, tx, domain, actor, "baseline", "", old, now); err != nil {
|
||||
return v, err
|
||||
}
|
||||
result.Version++
|
||||
updated, err := tx.ExecContext(ctx, `UPDATE organizer_work_sessions SET start_ms=?,end_ms=?,cancelled_ms=?,version=? WHERE uuid=? AND domain_uuid=? AND owner_uuid=? AND version=?`, result.StartMS, result.EndMS, result.CancelledMS, result.Version, old.UUID, domain, actor, old.Version)
|
||||
updated, err := tx.ExecContext(ctx, `UPDATE organizer_work_sessions SET start_ms=`+s.sqlParam(1)+`,end_ms=`+s.sqlParam(2)+`,cancelled_ms=`+s.sqlParam(3)+`,version=`+s.sqlParam(4)+` WHERE uuid=`+s.sqlParam(5)+` AND domain_uuid=`+s.sqlParam(6)+` AND owner_uuid=`+s.sqlParam(7)+` AND version=`+s.sqlParam(8)+``, result.StartMS, result.EndMS, result.CancelledMS, result.Version, old.UUID, domain, actor, old.Version)
|
||||
if err != nil {
|
||||
return v, err
|
||||
}
|
||||
@@ -80,7 +80,7 @@ func correctTaskWork(ctx context.Context, tx *sql.Tx, domain, actor, action, rea
|
||||
} else if count != 1 {
|
||||
return v, ErrTaskConflict
|
||||
}
|
||||
if err := auditTaskWork(ctx, tx, domain, actor, action, reason, result, now); err != nil {
|
||||
if err := s.auditTaskWork(ctx, tx, domain, actor, action, reason, result, now); err != nil {
|
||||
return v, err
|
||||
}
|
||||
return result, tx.Commit()
|
||||
@@ -100,15 +100,16 @@ type workCursor struct {
|
||||
UUID string `json:"uuid"`
|
||||
}
|
||||
|
||||
func (s *Store) TaskWorkHistory(ctx context.Context, domain, actor string, start, end time.Time, after string, limit int) (TaskWorkPage, error) {
|
||||
func (s *Store) TaskWorkHistory(ctx context.Context, domain, actor string, start, end time.Time, after string, limit int) (result0 TaskWorkPage, resultErr error) {
|
||||
defer func() { resultErr = s.sqlError("organizer repository", resultErr) }()
|
||||
out := TaskWorkPage{Items: []TaskWorkEntry{}}
|
||||
if err := taskActor(ctx, s.DB, domain, actor, false); err != nil {
|
||||
if err := s.taskActor(ctx, s.DB, domain, actor, false); err != nil {
|
||||
return out, err
|
||||
}
|
||||
if !end.After(start) || end.Sub(start) > 367*24*time.Hour || limit < 1 || limit > 100 {
|
||||
return out, ErrTaskInvalid
|
||||
}
|
||||
query := `SELECT w.uuid,w.task_uuid,w.start_ms,w.end_ms,w.version,w.cancelled_ms,COALESCE(i.title,''),COALESCE(i.project_uuid,'') FROM organizer_work_sessions w LEFT JOIN organizer_items i ON i.uuid=w.task_uuid AND i.domain_uuid=w.domain_uuid AND i.owner_uuid=w.owner_uuid WHERE w.domain_uuid=? AND w.owner_uuid=? AND w.start_ms<? AND (w.end_ms=0 OR w.end_ms>?)`
|
||||
query := `SELECT w.uuid,w.task_uuid,w.start_ms,w.end_ms,w.version,w.cancelled_ms,COALESCE(i.title,''),COALESCE(i.project_uuid,'') FROM organizer_work_sessions w LEFT JOIN organizer_items i ON i.uuid=w.task_uuid AND i.domain_uuid=w.domain_uuid AND i.owner_uuid=w.owner_uuid WHERE w.domain_uuid=` + s.sqlParam(1) + ` AND w.owner_uuid=` + s.sqlParam(2) + ` AND w.start_ms<` + s.sqlParam(3) + ` AND (w.end_ms=0 OR w.end_ms>` + s.sqlParam(4) + `)`
|
||||
args := []any{domain, actor, end.UnixMilli(), start.UnixMilli()}
|
||||
if after != "" {
|
||||
if len(after) > 256 {
|
||||
@@ -122,10 +123,10 @@ func (s *Store) TaskWorkHistory(ctx context.Context, domain, actor string, start
|
||||
if id, err := uuid.Parse(cursor.UUID); err != nil || id.String() != cursor.UUID {
|
||||
return out, ErrTaskInvalid
|
||||
}
|
||||
query += ` AND (w.start_ms,w.uuid)<(?,?)`
|
||||
query += ` AND (w.start_ms,w.uuid)<(` + s.sqlParam(len(args)+1) + `,` + s.sqlParam(len(args)+2) + `)`
|
||||
args = append(args, cursor.Start, cursor.UUID)
|
||||
}
|
||||
query += ` ORDER BY w.start_ms DESC,w.uuid DESC LIMIT ?`
|
||||
query += ` ORDER BY w.start_ms DESC,w.uuid DESC LIMIT ` + s.sqlParam(len(args)+1) + ``
|
||||
args = append(args, limit+1)
|
||||
rows, err := s.DB.QueryContext(ctx, query, args...)
|
||||
if err != nil {
|
||||
@@ -148,22 +149,23 @@ func (s *Store) TaskWorkHistory(ctx context.Context, domain, actor string, start
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
func (s *Store) TaskWorkRevisions(ctx context.Context, domain, actor, id string, before int64) ([]TaskWorkRevision, error) {
|
||||
func (s *Store) TaskWorkRevisions(ctx context.Context, domain, actor, id string, before int64) (result0 []TaskWorkRevision, resultErr error) {
|
||||
defer func() { resultErr = s.sqlError("organizer repository", resultErr) }()
|
||||
out := []TaskWorkRevision{}
|
||||
if err := taskActor(ctx, s.DB, domain, actor, false); err != nil {
|
||||
if err := s.taskActor(ctx, s.DB, domain, actor, false); err != nil {
|
||||
return out, err
|
||||
}
|
||||
if before < 0 {
|
||||
return out, ErrTaskInvalid
|
||||
}
|
||||
current, err := scanTaskWork(s.DB.QueryRowContext(ctx, `SELECT `+taskWorkColumns+` FROM organizer_work_sessions WHERE uuid=? AND domain_uuid=? AND owner_uuid=?`, id, domain, actor))
|
||||
current, err := scanTaskWork(s.DB.QueryRowContext(ctx, `SELECT `+taskWorkColumns+` FROM organizer_work_sessions WHERE uuid=`+s.sqlParam(1)+` AND domain_uuid=`+s.sqlParam(2)+` AND owner_uuid=`+s.sqlParam(3)+``, id, domain, actor))
|
||||
if err != nil {
|
||||
return out, err
|
||||
}
|
||||
if before == 0 {
|
||||
before = current.Version + 1
|
||||
}
|
||||
rows, err := s.DB.QueryContext(ctx, `SELECT action,reason,changed_ms,data FROM organizer_work_revisions WHERE work_uuid=? AND domain_uuid=? AND owner_uuid=? AND version<? ORDER BY version DESC LIMIT 100`, id, domain, actor, before)
|
||||
rows, err := s.DB.QueryContext(ctx, `SELECT action,reason,changed_ms,data FROM organizer_work_revisions WHERE work_uuid=`+s.sqlParam(1)+` AND domain_uuid=`+s.sqlParam(2)+` AND owner_uuid=`+s.sqlParam(3)+` AND version<`+s.sqlParam(4)+` ORDER BY version DESC LIMIT 100`, id, domain, actor, before)
|
||||
if err != nil {
|
||||
return out, err
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user