Skip to content

Fix EOY unit-test issues #1289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaeljvaldes merged 3 commits into from
Jan 6, 2026
Merged

Fix EOY unit-test issues #1289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d097b26
Fix EOY unit-test issues
carlpartridge Jan 2, 2026
ec683e3
Make sure handler uses mock enqueuer
carlpartridge Jan 2, 2026
78f641f
Merge branch 'main' into carl-fix-unit-tests-for-EOY
michaeljvaldes Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions bcda/api/requests_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,20 +156,21 @@ func (s *RequestsTestSuite) TestRunoutEnabled() {
if _, ok := tt.errToReturn.(CCLFNotFoundOperationOutcomeError); ok && tt.name == "Expired runout data" {
cutoffTime = time.Now().Add(-200 * 24 * time.Hour) // 200 days ago (past 180 day limit)
}

mockSvc.On("GetTimeConstraints", mock.Anything, mock.Anything).Return(service.TimeConstraints{}, nil)
mockSvc.On("GetCutoffTime", testUtils.CtxMatcher, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(cutoffTime, constants.GetExistingBenes)

switch tt.errToReturn {
case nil:
mockSvc.On("GetLatestCCLFFile", testUtils.CtxMatcher, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&models.CCLFFile{PerformanceYear: 24}, nil)
mockSvc.On("GetLatestCCLFFile", testUtils.CtxMatcher, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&models.CCLFFile{PerformanceYear: (utils.GetPY() - 1)}, nil)
enqueuer.On("AddPrepareJob", mock.Anything, mock.Anything).Return(nil)
case CCLFNotFoundOperationOutcomeError{}:
mockSvc.On("GetLatestCCLFFile", testUtils.CtxMatcher, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, service.CCLFNotFoundError{})
case DatabaseError{}:
mockSvc.On("GetLatestCCLFFile", testUtils.CtxMatcher, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, errors.New("database error"))
case QueueError{}:
mockSvc.On("GetLatestCCLFFile", testUtils.CtxMatcher, mock.AnythingOfType("string"), mock.AnythingOfType("time.Time"), mock.AnythingOfType("time.Time"), mock.Anything).
Return(&models.CCLFFile{PerformanceYear: 24}, nil)
Return(&models.CCLFFile{PerformanceYear: (utils.GetPY() - 1)}, nil)
enqueuer.On("AddPrepareJob", mock.Anything, mock.Anything).Return(errors.New("error"))
}

Expand Down Expand Up @@ -623,7 +624,7 @@ func (s *RequestsTestSuite) TestDataTypeAuthorization() {
mockSvc.On("GetACOConfigForID", mock.Anything).Return(test.acoConfig, true)
mockSvc.On("GetTimeConstraints", mock.Anything, mock.Anything).Return(service.TimeConstraints{}, nil)
mockSvc.On("GetCutoffTime", testUtils.CtxMatcher, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(time.Time{}, constants.GetExistingBenes)
mockSvc.On("GetLatestCCLFFile", testUtils.CtxMatcher, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&models.CCLFFile{PerformanceYear: 25}, nil)
mockSvc.On("GetLatestCCLFFile", testUtils.CtxMatcher, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&models.CCLFFile{PerformanceYear: utils.GetPY()}, nil)
mockSvc.On("FindOldCCLFFile", testUtils.CtxMatcher, mock.AnythingOfType("string"), mock.AnythingOfType("time.Time"), mock.AnythingOfType("time.Time")).Return(uint(1), nil)
h.Svc = &mockSvc

Expand Down Expand Up @@ -664,13 +665,16 @@ func (s *RequestsTestSuite) TestDataTypeAuthorization() {

// TestRequests verifies that we can initiate an export job for all resource types using all the different handlers
func (s *RequestsTestSuite) TestRequests() {

apiVersion := "v1"
fhirPath := "/" + apiVersion + "/fhir"
resourceMap := s.resourceType

h := newHandler(resourceMap, fhirPath, apiVersion, s.db, s.pool)

enqueuer := queueing.NewMockEnqueuer(s.T())
h.Enq = enqueuer
enqueuer.On("AddPrepareJob", mock.Anything, mock.Anything).Return(nil)

// Test Group and Patient
// Patient, Coverage, and ExplanationOfBenefit
// with And without Since parameter
Expand Down
62 changes: 31 additions & 31 deletions db/testdata/insert_cclf_files.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,41 +18,41 @@ insert into cclf_files(created_at, updated_at, cclf_num, name, aco_cms_id, times
(NOW(), NOW(), 8, 'T.C9994.ACO.ZC8Y45.D250909.T2135290', 'C9994', NOW(), 45, 'Completed', 0),
(NOW(), NOW(), 8, 'T.C9994.ACO.ZC8R68.D250909.T2135390', 'C9994', NOW(), 68, 'Completed', 1),
(NOW(), NOW(), 8, 'T.C9996.ACO.ZC8Y89.D250909.T2135490', 'C9996', NOW(), 89, 'Completed', 0),
(NOW(), NOW(), 8, 'T.C9996.ACO.ZC8R25.D250909.T2135590', 'C9996', NOW(), 25, 'Completed', 1),
(NOW(), NOW(), 8, 'T.C9996.ACO.ZC8R25.D250909.T2135590', 'C9996', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 1),
Copy link
Collaborator Author

@carlpartridge carlpartridge Jan 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont think these changes affected the specific failing unit-tests but seemed like a good thing to update.

(NOW(), NOW(), 8, 'T.K9994.ACO.ZC8Y39.D250909.T2136080', 'K9994', NOW(), 39, 'Completed', 0),
(NOW(), NOW(), 8, 'T.K9994.ACO.ZC8R26.D250909.T2136180', 'K9994', NOW(), 26, 'Completed', 1),
(NOW(), NOW(), 8, 'T.K9996.ACO.ZC8Y37.D250909.T2136280', 'K9996', NOW(), 37, 'Completed', 0),
(NOW(), NOW(), 8, 'T.K9996.ACO.ZC8R43.D250909.T2136380', 'K9996', NOW(), 43, 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9989.ZC8Y05.D250909.T2138450', 'A9989', NOW(), 5, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9989.ZC8Y31.D250909.T2138550', 'A9989', NOW(), 31, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9989.ZC8R48.D250909.T2139040', 'A9989', NOW(), 48, 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9996.ZC8R76.D250909.T2134020', 'A9996', NOW(), 24, 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9994.ZC8Y09.D250909.T2130490', 'A9994', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9996.ZC8Y95.D250909.T2130590', 'A9996', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.D9994.ACO.ZC8Y73.D250909.T2132270', 'D9994', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.D9996.ACO.ZC8Y30.D250909.T2132370', 'D9996', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9990.ZC8Y51.D250909.T2132460', 'A9990', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9991.ZC8Y06.D250909.T2132560', 'A9991', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9992.ZC8Y93.D250909.T2133060', 'A9992', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9993.ZC8Y29.D250909.T2133160', 'A9993', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9994.ZC8Y22.D250909.T2133320', 'A9994', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9994.ZC8R35.D250909.T2133420', 'A9994', NOW(), 24, 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9996.ZC8Y86.D250909.T2133520', 'A9996', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.D9994.ACO.ZC8Y95.D250909.T2136470', 'D9994', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.D9994.ACO.ZC8R37.D250909.T2136570', 'D9994', NOW(), 24, 'Completed', 1),
(NOW(), NOW(), 8, 'T.D9996.ACO.ZC8Y52.D250909.T2137070', 'D9996', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.D9996.ACO.ZC8R72.D250909.T2137170', 'D9996', NOW(), 24, 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9990.ZC8Y50.D250909.T2137260', 'A9990', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9990.ZC8R10.D250909.T2137360', 'A9990', NOW(), 24, 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9991.ZC8Y34.D250909.T2137460', 'A9991', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9991.ZC8R92.D250909.T2137560', 'A9991', NOW(), 24, 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9992.ZC8Y91.D250909.T2138050', 'A9992', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9992.ZC8R10.D250909.T2138150', 'A9992', NOW(), 24, 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9993.ZC8Y60.D250909.T2138250', 'A9993', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9993.ZC8R11.D250909.T2138350', 'A9993', NOW(), 24, 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9998.ZC8Y33.D250909.T2139140', 'A9998', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9998.ZC8Y34.D250909.T2139240', 'A9998', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9998.ZC8R17.D250909.T2139340', 'A9998', NOW(), 24, 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9999.ZC8Y08.D250909.T2139430', 'A9999', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9999.ZC8Y13.D250909.T2139530', 'A9999', NOW(), 25, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9999.ZC8R59.D250909.T2140030', 'A9999', NOW(), 24, 'Completed', 1)
(NOW(), NOW(), 8, 'T.BCD.A9996.ZC8R76.D250909.T2134020', 'A9996', NOW(), (to_char(NOW(), 'yy')::int - 1), 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9994.ZC8Y09.D250909.T2130490', 'A9994', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9996.ZC8Y95.D250909.T2130590', 'A9996', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.D9994.ACO.ZC8Y73.D250909.T2132270', 'D9994', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.D9996.ACO.ZC8Y30.D250909.T2132370', 'D9996', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9990.ZC8Y51.D250909.T2132460', 'A9990', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9991.ZC8Y06.D250909.T2132560', 'A9991', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9992.ZC8Y93.D250909.T2133060', 'A9992', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9993.ZC8Y29.D250909.T2133160', 'A9993', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9994.ZC8Y22.D250909.T2133320', 'A9994', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9994.ZC8R35.D250909.T2133420', 'A9994', NOW(), (to_char(NOW(), 'yy')::int - 1), 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9996.ZC8Y86.D250909.T2133520', 'A9996', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.D9994.ACO.ZC8Y95.D250909.T2136470', 'D9994', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.D9994.ACO.ZC8R37.D250909.T2136570', 'D9994', NOW(), (to_char(NOW(), 'yy')::int - 1), 'Completed', 1),
(NOW(), NOW(), 8, 'T.D9996.ACO.ZC8Y52.D250909.T2137070', 'D9996', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.D9996.ACO.ZC8R72.D250909.T2137170', 'D9996', NOW(), (to_char(NOW(), 'yy')::int - 1), 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9990.ZC8Y50.D250909.T2137260', 'A9990', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9990.ZC8R10.D250909.T2137360', 'A9990', NOW(), (to_char(NOW(), 'yy')::int - 1), 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9991.ZC8Y34.D250909.T2137460', 'A9991', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9991.ZC8R92.D250909.T2137560', 'A9991', NOW(), (to_char(NOW(), 'yy')::int - 1), 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9992.ZC8Y91.D250909.T2138050', 'A9992', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9992.ZC8R10.D250909.T2138150', 'A9992', NOW(), (to_char(NOW(), 'yy')::int - 1), 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9993.ZC8Y60.D250909.T2138250', 'A9993', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9993.ZC8R11.D250909.T2138350', 'A9993', NOW(), (to_char(NOW(), 'yy')::int - 1), 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9998.ZC8Y33.D250909.T2139140', 'A9998', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9998.ZC8Y34.D250909.T2139240', 'A9998', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9998.ZC8R17.D250909.T2139340', 'A9998', NOW(), (to_char(NOW(), 'yy')::int - 1), 'Completed', 1),
(NOW(), NOW(), 8, 'T.BCD.A9999.ZC8Y08.D250909.T2139430', 'A9999', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9999.ZC8Y13.D250909.T2139530', 'A9999', NOW(), to_char(NOW(), 'yy')::int, 'Completed', 0),
(NOW(), NOW(), 8, 'T.BCD.A9999.ZC8R59.D250909.T2140030', 'A9999', NOW(), (to_char(NOW(), 'yy')::int - 1), 'Completed', 1)
Loading