Harvest normalization failure: fixing the schemas (#5701)

* commit fixes * change * change * fixing crit typo * fixing type * remove primary key inherited by default * fixing primary keys * reportbase primary_key
airbytehq · Aug 31, 2021 · 90e909f · 90e909f
1 parent 3b8f6e8
commit 90e909f
Show file tree

Hide file tree

Showing 20 changed files with 188 additions and 71 deletions.
diff --git a/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/estimate_messages.json b/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/estimate_messages.json
@@ -29,7 +29,18 @@
       "format": "date-time"
     },
     "recipients": {
-      "type": ["null", "array"]
+      "type": ["null", "array"],
+      "items": {
+        "properties": {
+          "email": {
+            "type": ["string", "null"]
+          },
+          "name": {
+            "type": ["string", "null"]
+          }
+        },
+        "type": "object"
+      }
     },
     "event_type": {
       "type": ["null", "string"]

diff --git a/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/expenses.json b/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/expenses.json
@@ -82,7 +82,7 @@
           "type": ["null", "boolean"]
         },
         "budget": {
-          "type": ["null", "string"]
+          "type": ["null", "number"]
         },
         "created_at": {
           "type": ["null", "string"],
@@ -94,6 +94,9 @@
         },
         "hourly_rate": {
           "type": ["null", "number"]
+        },
+        "use_default_rates": {
+          "type": ["null", "boolean"]
         }
       }
     },
@@ -121,7 +124,7 @@
           "type": ["null", "string"]
         },
         "unit_price": {
-          "type": ["null", "string"]
+          "type": ["null", "number"]
         },
         "unit_name": {
           "type": ["null", "string"]

diff --git a/...te-integrations/connectors/source-harvest/source_harvest/schemas/expenses_categories.json b/...te-integrations/connectors/source-harvest/source_harvest/schemas/expenses_categories.json
@@ -9,10 +9,10 @@
       "type": ["null", "string"]
     },
     "total_amount": {
-      "type": ["null", "integer"]
+      "type": ["null", "number"]
     },
     "billable_amount": {
-      "type": ["null", "integer"]
+      "type": ["null", "number"]
     },
     "currency": {
       "type": ["null", "string"]

diff --git a/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/expenses_clients.json b/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/expenses_clients.json
@@ -9,10 +9,10 @@
       "type": ["null", "string"]
     },
     "total_amount": {
-      "type": ["null", "integer"]
+      "type": ["null", "number"]
     },
     "billable_amount": {
-      "type": ["null", "integer"]
+      "type": ["null", "number"]
     },
     "currency": {
       "type": ["null", "string"]

diff --git a/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/expenses_team.json b/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/expenses_team.json
@@ -12,10 +12,10 @@
       "type": ["null", "boolean"]
     },
     "total_amount": {
-      "type": ["null", "integer"]
+      "type": ["null", "number"]
     },
     "billable_amount": {
-      "type": ["null", "integer"]
+      "type": ["null", "number"]
     },
     "currency": {
       "type": ["null", "string"]

diff --git a/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/invoice_messages.json b/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/invoice_messages.json
@@ -47,14 +47,17 @@
       "type": ["null", "string"]
     },
     "recipients": {
-      "type": ["null", "object"],
-      "properties": {
-        "name": {
-          "type": ["null", "string"]
+      "type": ["null", "array"],
+      "items": {
+        "properties": {
+          "email": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          }
         },
-        "email": {
-          "type": ["null", "string"]
-        }
+        "type": "object"
       }
     },
     "subject": {

diff --git a/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/invoice_payments.json b/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/invoice_payments.json
@@ -6,7 +6,7 @@
       "type": ["null", "integer"]
     },
     "amount": {
-      "type": ["null", "integer"]
+      "type": ["null", "number"]
     },
     "paid_at": {
       "type": ["null", "string"],

diff --git a/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/invoices.json b/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/invoices.json
@@ -21,22 +21,22 @@
       "type": ["null", "number"]
     },
     "tax": {
-      "type": ["null", "integer"]
+      "type": ["null", "number"]
     },
     "tax_amount": {
       "type": ["null", "number"]
     },
     "tax2": {
-      "type": ["null", "integer"]
+      "type": ["null", "number"]
     },
     "tax2_amount": {
       "type": ["null", "number"]
     },
     "discount": {
-      "type": ["null", "integer"]
+      "type": ["null", "number"]
     },
     "discount_amount": {
-      "type": ["null", "integer"]
+      "type": ["null", "number"]
     },
     "subject": {
       "type": ["null", "string"]
@@ -94,7 +94,15 @@
       "type": ["null", "string"]
     },
     "client": {
-      "type": ["null", "string"]
+      "type": ["null", "object"],
+      "properties": {
+        "id": {
+          "type": ["null", "integer"]
+        },
+        "name": {
+          "type": ["null", "string"]
+        }
+      }
     },
     "estimate": {
       "type": ["null", "string"]
@@ -103,39 +111,61 @@
       "type": ["null", "string"]
     },
     "creator": {
-      "type": ["null", "string"]
-    },
-    "line_items": {
       "type": ["null", "object"],
       "properties": {
         "id": {
           "type": ["null", "integer"]
         },
-        "kind": {
-          "type": ["null", "string"]
-        },
-        "description": {
-          "type": ["null", "string"]
-        },
-        "quantity": {
-          "type": ["null", "integer"]
-        },
-        "unit_price": {
-          "type": ["null", "integer"]
-        },
-        "amount": {
-          "type": ["null", "integer"]
-        },
-        "taxed": {
-          "type": ["null", "boolean"]
-        },
-        "taxed2": {
-          "type": ["null", "boolean"]
-        },
-        "project": {
+        "name": {
           "type": ["null", "string"]
         }
       }
+    },
+    "line_items": {
+      "type": ["null", "array"],
+      "items": {
+        "type": ["null", "object"],
+        "properties": {
+          "id": {
+            "type": ["null", "integer"]
+          },
+          "kind": {
+            "type": ["null", "string"]
+          },
+          "description": {
+            "type": ["null", "string"]
+          },
+          "quantity": {
+            "type": ["null", "number"]
+          },
+          "unit_price": {
+            "type": ["null", "number"]
+          },
+          "amount": {
+            "type": ["null", "number"]
+          },
+          "taxed": {
+            "type": ["null", "boolean"]
+          },
+          "taxed2": {
+            "type": ["null", "boolean"]
+          },
+          "project": {
+            "type": ["null", "object"],
+            "properties": {
+              "code": {
+                "type": ["null", "string"]
+              },
+              "id": {
+                "type": ["integer", "null"]
+              },
+              "name": {
+                "type": ["null", "string"]
+              }
+            }
+          }
+        }
+      }
     }
   }
 }
diff --git a/...te-integrations/connectors/source-harvest/source_harvest/schemas/project_assignments.json b/...te-integrations/connectors/source-harvest/source_harvest/schemas/project_assignments.json
@@ -15,7 +15,7 @@
       "type": ["null", "boolean"]
     },
     "budget": {
-      "type": ["null", "string"]
+      "type": ["null", "number"]
     },
     "created_at": {
       "type": ["null", "string"],
@@ -50,11 +50,51 @@
         },
         "name": {
           "type": ["null", "string"]
+        },
+        "currency": {
+          "type": ["null", "string"]
         }
       }
     },
     "task_assignments": {
-      "type": ["null", "array"]
+      "type": ["null", "array"],
+      "items": {
+        "properties": {
+          "billable": {
+            "type": ["null", "boolean"]
+          },
+          "budget": {
+            "type": ["null", "number"]
+          },
+          "created_at": {
+            "type": ["string", "null"]
+          },
+          "hourly_rate": {
+            "type": ["null", "number"]
+          },
+          "id": {
+            "type": ["null", "integer"]
+          },
+          "is_active": {
+            "type": ["null", "boolean"]
+          },
+          "task": {
+            "properties": {
+              "id": {
+                "type": ["null", "integer"]
+              },
+              "name": {
+                "type": ["null", "string"]
+              }
+            },
+            "type": ["object", "null"]
+          },
+          "updated_at": {
+            "type": ["null", "string"]
+          }
+        },
+        "type": "object"
+      }
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/project_budget.json b/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/project_budget.json
@@ -24,13 +24,13 @@
       "type": ["null", "boolean"]
     },
     "budget": {
-      "type": ["null", "integer"]
+      "type": ["null", "number"]
     },
     "budget_spent": {
-      "type": ["null", "integer"]
+      "type": ["null", "number"]
     },
     "budget_remaining": {
-      "type": ["null", "integer"]
+      "type": ["null", "number"]
     },
     "from": {
       "type": ["null", "string"]

diff --git a/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/projects.json b/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/projects.json
@@ -78,7 +78,7 @@
       }
     },
     "cost_budget": {
-      "type": ["null", "string"]
+      "type": ["null", "number"]
     },
     "cost_budget_include_expenses": {
       "type": ["null", "boolean"]
@@ -87,7 +87,7 @@
       "type": ["null", "number"]
     },
     "fee": {
-      "type": ["null", "string"]
+      "type": ["null", "number"]
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/roles.json b/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/roles.json
@@ -17,7 +17,10 @@
       "format": "date-time"
     },
     "user_ids": {
-      "type": ["null", "array"]
+      "type": ["null", "array"],
+      "items": {
+        "type": "integer"
+      }
     }
   }
 }
diff --git a/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/time_clients.json b/airbyte-integrations/connectors/source-harvest/source_harvest/schemas/time_clients.json
@@ -18,7 +18,7 @@
       "type": ["null", "string"]
     },
     "billable_amount": {
-      "type": ["null", "integer"]
+      "type": ["null", "number"]
     },
     "from": {
       "type": ["null", "string"]