added additional filtering for return method by specifying only retur…

…n content since last update
CACI-MIlMOVE · Sep 1, 2023 · e0bf985 · e0bf985
1 parent 886151f
commit e0bf985
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/pkg/trdm/get_table.go b/pkg/trdm/get_table.go
@@ -62,8 +62,9 @@ type GetTableRequestElement struct {
 	privateKey    *rsa.PrivateKey
 	Input         struct {
 		TRDM struct {
-			PhysicalName  string `xml:"physicalName"`
-			ReturnContent string `xml:"returnContent"`
+			PhysicalName                string `xml:"physicalName"`
+			ReturnContent               string `xml:"returnContent"`
+			ContentUpdatedSinceDateTime string `xml:"contentUpdatedSinceDateTime"`
 		}
 	}
 }
@@ -99,23 +100,26 @@ type GetTableUpdater interface {
 	GetTable(appCtx appcontext.AppContext, physicalName string, lastUpdate string) error
 }
 
-func NewGetTable(physicalName string, securityToken string, privateKey *rsa.PrivateKey, soapClient SoapCaller) GetTableUpdater {
+func NewGetTable(physicalName string, lastUpdateDateTime string, securityToken string, privateKey *rsa.PrivateKey, soapClient SoapCaller) GetTableUpdater {
 	return &GetTableRequestElement{
 		securityToken: securityToken,
 		privateKey:    privateKey,
 		soapClient:    soapClient,
 		Input: struct {
 			TRDM struct {
-				PhysicalName  string `xml:"physicalName"`
-				ReturnContent string `xml:"returnContent"`
+				PhysicalName                string `xml:"physicalName"`
+				ReturnContent               string `xml:"returnContent"`
+				ContentUpdatedSinceDateTime string `xml:"contentUpdatedSinceDateTime"`
 			}
 		}{
 			TRDM: struct {
-				PhysicalName  string `xml:"physicalName"`
-				ReturnContent string `xml:"returnContent"`
+				PhysicalName                string `xml:"physicalName"`
+				ReturnContent               string `xml:"returnContent"`
+				ContentUpdatedSinceDateTime string `xml:"contentUpdatedSinceDateTime"`
 			}{
-				PhysicalName:  physicalName,
-				ReturnContent: fmt.Sprintf("%t", true),
+				PhysicalName:                physicalName,
+				ReturnContent:               fmt.Sprintf("%t", true),
+				ContentUpdatedSinceDateTime: lastUpdateDateTime,
 			},
 		},
 	}

diff --git a/pkg/trdm/get_table_test.go b/pkg/trdm/get_table_test.go
@@ -78,7 +78,7 @@ func (suite *TRDMSuite) TestGetTableFake() {
 				suite.Error(keyErr)
 			}
 
-			getTable := trdm.NewGetTable(test.physicalName, "kjdhfkasjhflaksjfhklafhkadsf=", privatekey, testSoapClient)
+			getTable := trdm.NewGetTable(test.physicalName, time.Now().Format(time.RFC3339), "kjdhfkasjhflaksjfhklafhkadsf=", privatekey, testSoapClient)
 			err := getTable.GetTable(suite.AppContextForTest(), test.physicalName, time.Now().Format(time.RFC3339))
 
 			if err != nil {

diff --git a/pkg/trdm/last_table_update.go b/pkg/trdm/last_table_update.go
@@ -131,7 +131,7 @@ func lastTableUpdateSoapCall(d *GetLastTableUpdateRequestElement, params gosoap.
 	}
 
 	if r.Status.StatusCode == successfulStatusCode {
-		getTable := NewGetTable(d.PhysicalName, d.securityToken, d.privateKey, d.soapClient)
+		getTable := NewGetTable(d.PhysicalName, r.LastUpdate, d.securityToken, d.privateKey, d.soapClient)
 		getTableErr := getTable.GetTable(appCtx, d.PhysicalName, r.LastUpdate)
 		if getTableErr != nil {
 			return fmt.Errorf("getTable error: %s", getTableErr.Error())