Empty update_at results in broker aging, set it at creation (#688)

Author: jakub-id

broker/migrations/053_initialize_updated_at.down.sql

@@ -0,0 +1,11 @@
+ALTER TABLE patron_request
+    ALTER COLUMN updated_at DROP NOT NULL,
+    ALTER COLUMN updated_at DROP DEFAULT;
+
+ALTER TABLE scheduled_task
+    ALTER COLUMN updated_at DROP NOT NULL,
+    ALTER COLUMN updated_at DROP DEFAULT;
+
+ALTER TABLE template
+    ALTER COLUMN updated_at DROP NOT NULL,
+    ALTER COLUMN updated_at DROP DEFAULT;

broker/migrations/053_initialize_updated_at.up.sql

@@ -0,0 +1,23 @@
+UPDATE patron_request
+SET updated_at = created_at
+WHERE updated_at IS NULL;
+
+ALTER TABLE patron_request
+    ALTER COLUMN updated_at SET DEFAULT now(),
+    ALTER COLUMN updated_at SET NOT NULL;
+
+UPDATE scheduled_task
+SET updated_at = created_at
+WHERE updated_at IS NULL;
+
+ALTER TABLE scheduled_task
+    ALTER COLUMN updated_at SET DEFAULT now(),
+    ALTER COLUMN updated_at SET NOT NULL;
+
+UPDATE template
+SET updated_at = created_at
+WHERE updated_at IS NULL;
+
+ALTER TABLE template
+    ALTER COLUMN updated_at SET DEFAULT now(),
+    ALTER COLUMN updated_at SET NOT NULL;

broker/patron_request/db/prrepo.go

@@ -232,6 +232,9 @@ func (r *PgPrRepo) UpdatePatronRequestInternalNote(ctx common.ExtendedContext, i
 	})
 }
 func (r *PgPrRepo) CreatePatronRequest(ctx common.ExtendedContext, params CreatePatronRequestParams) (PatronRequest, error) {
+	if !params.UpdatedAt.Valid {
+		params.UpdatedAt = params.CreatedAt
+	}
 	row, err := r.queries.CreatePatronRequest(ctx, r.GetConnOrTx(), params)
 	return row.PatronRequest, err
 }
@@ -322,6 +325,9 @@ func (r *PgPrRepo) DeleteItemById(ctx common.ExtendedContext, id string) error {
 }
 
 func (r *PgPrRepo) SaveTemplate(ctx common.ExtendedContext, params SaveTemplateParams) (Template, error) {
+	if !params.UpdatedAt.Valid {
+		params.UpdatedAt = params.CreatedAt
+	}
 	row, err := r.queries.SaveTemplate(ctx, r.GetConnOrTx(), params)
 	return row.Template, err
 }

broker/scheduler/db/repo.go

@@ -47,6 +47,9 @@ func CreateSchedRepo(dbPool *pgxpool.Pool) SchedRepo {
 }
 
 func (r *PgSchedRepo) SaveScheduledTask(ctx common.ExtendedContext, params SaveScheduledTaskParams) (ScheduledTask, error) {
+	if !params.UpdatedAt.Valid {
+		params.UpdatedAt = params.CreatedAt
+	}
 	row, err := r.queries.SaveScheduledTask(ctx, r.GetConnOrTx(), params)
 	if err == nil {
 		r.notify(ctx)

broker/sqlc/pr_schema.sql

@@ -18,7 +18,7 @@ CREATE TABLE patron_request
     items               JSONB NOT NULL DEFAULT '[]'::jsonb,
     language            regconfig NOT NULL DEFAULT 'english',
     terminal_state      BOOLEAN NOT NULL DEFAULT false,
-    updated_at          TIMESTAMP,
+    updated_at          TIMESTAMP NOT NULL DEFAULT now(),
     ill_response        jsonb NOT NULL DEFAULT '{}'::jsonb,
     internal_note       TEXT,
     next_req_id         VARCHAR,
@@ -74,7 +74,7 @@ CREATE TABLE template
     labels       TEXT[]    NOT NULL DEFAULT '{}',
     audience     VARCHAR,
     created_at   TIMESTAMP NOT NULL DEFAULT now(),
-    updated_at   TIMESTAMP
+    updated_at   TIMESTAMP NOT NULL DEFAULT now()
 );
 
 CREATE OR REPLACE FUNCTION immutable_to_timestamp(text)

broker/sqlc/sched_schema.sql

@@ -9,11 +9,11 @@ CREATE TABLE scheduled_task
     status      TEXT        NOT NULL DEFAULT 'pending',
     owner       TEXT        NOT NULL,
     created_at  TIMESTAMPTZ NOT NULL DEFAULT now(),
-    updated_at  TIMESTAMPTZ,
+    updated_at  TIMESTAMPTZ NOT NULL DEFAULT now(),
     FOREIGN KEY (event_name) REFERENCES event_config (event_name)
 );
 
 CREATE INDEX idx_scheduled_task_run_at ON scheduled_task (run_at) WHERE status = 'pending' AND run_at IS NOT NULL;
 
 CREATE INDEX idx_scheduled_task_id_owner ON scheduled_task (id, owner);
-CREATE INDEX idx_scheduled_task_owner ON scheduled_task (owner);
+CREATE INDEX idx_scheduled_task_owner ON scheduled_task (owner);

broker/test/patron_request/api/api-handler_test.go

@@ -1479,7 +1479,9 @@ func TestCRUDTemplate(t *testing.T) {
 	assert.Equal(t, newTemplate.Labels, createdTemplate.Labels)
 	assert.Equal(t, newTemplate.Body, createdTemplate.Body)
 	assert.False(t, createdTemplate.CreatedAt.IsZero())
-	assert.Nil(t, createdTemplate.UpdatedAt)
+	if assert.NotNil(t, createdTemplate.UpdatedAt) {
+		assert.Equal(t, createdTemplate.CreatedAt, *createdTemplate.UpdatedAt)
+	}
 
 	templateId := createdTemplate.Id
 	thisTemplatePath := templatePath + "/" + templateId

broker/test/patron_request/db/prrepo_test.go

@@ -71,7 +71,7 @@ func TestMain(m *testing.M) {
 
 func TestItem(t *testing.T) {
 	prId := uuid.NewString()
-	_, err := prRepo.CreatePatronRequest(appCtx, pr_db.CreatePatronRequestParams{
+	pr, err := prRepo.CreatePatronRequest(appCtx, pr_db.CreatePatronRequestParams{
 		ID: prId,
 		CreatedAt: pgtype.Timestamp{
 			Time:  time.Now(),
@@ -82,6 +82,8 @@ func TestItem(t *testing.T) {
 		TerminalState: false,
 	})
 	assert.NoError(t, err)
+	assert.True(t, pr.UpdatedAt.Valid)
+	assert.Equal(t, pr.CreatedAt.Time, pr.UpdatedAt.Time)
 
 	// Save works
 	itemId := uuid.NewString()
@@ -166,6 +168,24 @@ func TestItem(t *testing.T) {
 	assert.NoError(t, err)
 }
 
+func TestTemplateUpdatedAtInitializedFromCreatedAt(t *testing.T) {
+	createdAt := pgtype.Timestamp{Time: time.Now(), Valid: true}
+	template, err := prRepo.SaveTemplate(appCtx, pr_db.SaveTemplateParams{
+		ID:          uuid.NewString(),
+		Owner:       "ISIL:TEST",
+		Title:       "Test template",
+		Purpose:     "general",
+		Body:        "Body",
+		ContentType: "text/plain",
+		Labels:      []string{},
+		CreatedAt:   createdAt,
+	})
+
+	assert.NoError(t, err)
+	assert.True(t, template.UpdatedAt.Valid)
+	assert.Equal(t, template.CreatedAt.Time, template.UpdatedAt.Time)
+}
+
 func TestNotification(t *testing.T) {
 	prId := uuid.NewString()
 	_, err := prRepo.CreatePatronRequest(appCtx, pr_db.CreatePatronRequestParams{

broker/test/scheduler/db/schedrepo_test.go

@@ -97,6 +97,8 @@ func TestSaveScheduledTask_Insert(t *testing.T) {
 	assert.Equal(t, params.Schedule, saved.Schedule)
 	assert.Equal(t, sched_db.ScheduledTaskStatusPending, saved.Status)
 	assert.True(t, saved.CreatedAt.Valid)
+	assert.True(t, saved.UpdatedAt.Valid)
+	assert.Equal(t, saved.CreatedAt.Time, saved.UpdatedAt.Time)
 
 	stopTask(t, saved)
 }