Merge pull request #2111 from afumagalli98/fix-oracle-segment-size

fix oracle segment size & update license history client timeout

Author: afumagalli98

api-service/database/oracle_segment_advisors.go

@@ -55,13 +55,25 @@ func (md *MongoDatabase) SearchOracleDatabaseSegmentAdvisors(keywords []string,
 			}),
 			mu.APUnwind("$database.segmentAdvisors"),
 			mu.APProject(bson.M{
-				"hostname":       true,
-				"location":       true,
-				"environment":    true,
-				"createdAt":      true,
-				"dbname":         "$database.name",
-				"reclaimable":    "$database.segmentAdvisors.reclaimable",
-				"retrieve":       bson.M{"$round": bson.A{mu.APODivide("$database.segmentAdvisors.reclaimable", "$database.segmentsSize"), 4}},
+				"hostname":    true,
+				"location":    true,
+				"environment": true,
+				"createdAt":   true,
+				"dbname":      "$database.name",
+				"reclaimable": "$database.segmentAdvisors.reclaimable",
+				"retrieve": bson.M{
+					"$round": bson.A{
+						bson.M{
+							"$cond": bson.A{
+								bson.M{"$eq": bson.A{"$database.segmentsSize", 0}},
+								0,
+								bson.M{"$divide": bson.A{"$database.segmentAdvisors.reclaimable", "$database.segmentsSize"}},
+							},
+						},
+						4,
+					},
+				},
+
 				"segmentOwner":   "$database.segmentAdvisors.segmentOwner",
 				"segmentName":    "$database.segmentAdvisors.segmentName",
 				"segmentType":    "$database.segmentAdvisors.segmentType",

data-service/job/licenses_history_job.go

@@ -43,7 +43,7 @@ func (job *HistoricizeLicensesComplianceJob) Run() {
 		job.Config.APIService.AuthenticationProvider.Password,
 		"/hosts/technologies/all/databases/licenses-compliance").String()
 
-	client := http.Client{Timeout: 1 * time.Minute}
+	client := http.Client{Timeout: 3 * time.Minute}
 
 	resp, err := client.Get(url)
 	if err != nil || resp == nil {