BCDA-2384 Feature: Updated regex for cclf zip files (#426)

* Updated regex for cclf zip files

* modified regex

bcda/cclf/cclf.go

@@ -255,7 +255,7 @@ func importCCLF(fileMetadata *cclfFileMetadata, importFunc func(uint, []byte, *g
 func getCCLFArchiveMetadata(filePath string) (cclfFileMetadata, error) {
 	var metadata cclfFileMetadata
 	// CCLF filename convention for SSP with BCD identifier: P.BCD.ACO.ZC0Yyy.Dyymmdd.Thhmmsst (timestamp will include the ACO ID value)
-	filenameRegexp := regexp.MustCompile(`(T|P)\.BCD\.ACO\.ZC(0|8)Y(\d{2})\.(D\d{6})\.T(\d{4})\d{3}`)
+	filenameRegexp := regexp.MustCompile(`(T|P)\.BCD\.ACOB?\.ZC(0|8)Y(\d{2})\.(D\d{6})\.T(\d{4})\d{3}`)
 	filenameMatches := filenameRegexp.FindStringSubmatch(filePath)
 	if len(filenameMatches) < 5 {
 		fmt.Printf("Invalid zipped filename for file: %s.\n", filePath)

bcda/cclf/cclf_test.go

@@ -338,6 +338,18 @@ func (s *CCLFTestSuite) TestGetCCLFArchiveMetadata() {
 	assert.Equal(18, metadata.perfYear)
 	assert.Nil(err)
 
+	//CMS EFT file format with ACOB identifier
+	metadata, err = getCCLFArchiveMetadata("/BCD/T.BCD.ACOB.ZC0Y18.D181120.T0001000")
+	expDate, _ = time.Parse("2006-01-02", "2018-11-20")
+	assert.Equal("test", metadata.env)
+	assert.Equal("A0001", metadata.acoID)
+	assert.Equal(0, metadata.cclfNum)
+	assert.Equal(expDate.Year(), metadata.timestamp.Year())
+	assert.Equal(expDate.Month(), metadata.timestamp.Month())
+	assert.Equal(expDate.Day(), metadata.timestamp.Day())
+	assert.Equal(18, metadata.perfYear)
+	assert.Nil(err)
+
 	metadata, err = getCCLFArchiveMetadata("/BCD/T.BCD.ACO.ZC8Y18.D190112.T0012000")
 	expDate, _ = time.Parse("2006-01-02", "2019-01-12")
 	assert.Equal("test", metadata.env)
@@ -377,7 +389,7 @@ func (s *CCLFTestSuite) TestSortCCLFArchives() {
 	filePath := BASE_FILE_PATH + "cclf/archives/valid/"
 	err := filepath.Walk(filePath, sortCCLFArchives(&cclfmap, &skipped))
 	assert.Nil(err)
-	assert.Equal(2, len(cclfmap["A0001"][18]))
+	assert.Equal(3, len(cclfmap["A0001"][18]))
 	assert.Equal(1, skipped)
 	testUtils.ResetFiles(s.Suite, filePath)