Merged in bugfix/errhandling (pull request #89)

Error handling * basic
2025-03-05 19:49:03 +00:00
parent c78ca26a6f
commit 8f409e60a8
36 changed files with 965 additions and 641 deletions
@@ -51,48 +51,63 @@ func TestDocCleanRunner(t *testing.T) {
 	})
 	assert.NotNil(t, runner)

-	doc := doctextrunner.Body{
-		ID: uuid.New(),
-	}
-	bodyBytes, err := json.Marshal(doc)
-	assert.NoError(t, err)
-	body := string(bodyBytes)
-	msg := &types.Message{
-		Body: &body,
-	}
+	t.Run("valid", func(t *testing.T) {
+		doc := doctextrunner.Body{
+			ID: uuid.New(),
+		}
+		bodyBytes, err := json.Marshal(doc)
+		assert.NoError(t, err)
+		body := string(bodyBytes)
+		msg := &types.Message{
+			Body: &body,
+		}

-	inloc := document.Location{
-		Bucket: "bucket_name",
-		Key:    "/i/am/here",
-	}
+		inloc := document.Location{
+			Bucket: "bucket_name",
+			Key:    "/i/am/here",
+		}

-	pool.ExpectQuery("name: IsDocumentTextExtracted :one").WithArgs(database.MustToDBUUID(doc.ID)).WillReturnRows(
-		pgxmock.NewRows([]string{"isextracted"}).
-			AddRow(false),
-	)
-	cleanId := database.MustToDBUUID(uuid.New())
-	mimeType := "application/pdf"
-	dbmimetype := repository.NullCleanmimetype{
-		Valid:         true,
-		Cleanmimetype: repository.Cleanmimetype(mimeType),
-	}
-	pool.ExpectQuery("name: GetDocumentCleanEntry :one").WithArgs(database.MustToDBUUID(doc.ID)).WillReturnRows(
-		pgxmock.NewRows([]string{"id", "documentId", "bucket", "key", "version", "mimetype", "fail"}).
-			AddRow(cleanId, database.MustToDBUUID(doc.ID), &inloc.Bucket, &inloc.Key, int32(1), dbmimetype, repository.NullCleanfailtype{}),
-	)
-	pool.ExpectExec("name: AddDocumentTextEntry :exec").WithArgs(int32(1), inloc.Bucket, inloc.Key, cleanId).
-		WillReturnResult(pgxmock.NewResult("", 1))
+		pool.ExpectQuery("name: IsDocumentTextExtracted :one").WithArgs(database.MustToDBUUID(doc.ID)).WillReturnRows(
+			pgxmock.NewRows([]string{"isextracted"}).
+				AddRow(false),
+		)
+		cleanId := database.MustToDBUUID(uuid.New())
+		mimeType := "application/pdf"
+		dbmimetype := repository.NullCleanmimetype{
+			Valid:         true,
+			Cleanmimetype: repository.Cleanmimetype(mimeType),
+		}
+		pool.ExpectQuery("name: GetCleanEntryByDocId :one").WithArgs(database.MustToDBUUID(doc.ID)).WillReturnRows(
+			pgxmock.NewRows([]string{"id", "documentId", "bucket", "key", "version", "mimetype", "fail"}).
+				AddRow(cleanId, database.MustToDBUUID(doc.ID), &inloc.Bucket, &inloc.Key, int32(1), dbmimetype, repository.NullCleanfailtype{}),
+		)
+		pool.ExpectQuery("name: GetCleanEntry :one").WithArgs(cleanId).WillReturnRows(
+			pgxmock.NewRows([]string{"id", "documentId", "bucket", "key", "version", "mimetype", "fail"}).
+				AddRow(cleanId, database.MustToDBUUID(doc.ID), &inloc.Bucket, &inloc.Key, int32(1), dbmimetype, repository.NullCleanfailtype{}),
+		)
+		pool.ExpectExec("name: AddDocumentTextEntry :exec").WithArgs(int32(1), inloc.Bucket, inloc.Key, cleanId).
+			WillReturnResult(pgxmock.NewResult("", 1))

-	mockSQS.EXPECT().
-		SendMessage(
-			mock.Anything,
-			mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
-				return *in.QueueUrl == cfg.QuerySyncURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", doc.ID.String())
-			}),
-			mock.Anything,
-		).
-		Return(&sqs.SendMessageOutput{}, nil)
+		mockSQS.EXPECT().
+			SendMessage(
+				mock.Anything,
+				mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
+					return *in.QueueUrl == cfg.QuerySyncURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", doc.ID.String())
+				}),
+				mock.Anything,
+			).
+			Return(&sqs.SendMessageOutput{}, nil)

-	err = runner.Process(ctx, msg)
-	assert.NoError(t, err)
+		assert.True(t, runner.Process(ctx, msg))
+	})
+	t.Run("invalid body", func(t *testing.T) {
+		body := "definitely invalid"
+		msgId := "id"
+		msg := &types.Message{
+			Body:      &body,
+			MessageId: &msgId,
+		}
+
+		assert.True(t, runner.Process(ctx, msg))
+	})
 }