merged

src/clj/auto_ap/ezcater/core.clj

@@ -200,17 +200,13 @@
      :returns        0.0
      :vendor         :vendor/ccp-ezcater}))
 
-(defn lookup-order [json]
+
-  (let [caterer     (get-caterer (get json "parent_id"))
+(defn get-by-id [integration id]
-        integration (:ezcater-integration/_caterers caterer)
+  (query 
-        client      (-> caterer :ezcater-location/_caterer first :client/_ezcater-locations :client/code)
-        location    (-> caterer :ezcater-location/_caterer first :ezcater-location/location)]
-    (if (and client location)
-      (doto 
-          (-> (query 
     integration
-                {:venia/queries [[:order {:id (get json "entity_id")}
+    {:venia/queries [[:order {:id id}
                       [:uuid
+                       :orderNumber
                        :orderSourceType
                        [:caterer
                         [:name
@@ -258,7 +254,16 @@
                                    ]]
                                  [:subTotal
                                   [:currency
-                                               :subunits]]]]]]]})
+                                   :subunits]]]]]]]}))
+
+(defn lookup-order [json]
+  (let [caterer     (get-caterer (get json "parent_id"))
+        integration (:ezcater-integration/_caterers caterer)
+        client      (-> caterer :ezcater-location/_caterer first :client/_ezcater-locations :client/code)
+        location    (-> caterer :ezcater-location/_caterer first :ezcater-location/location)]
+    (if (and client location)
+      (doto 
+          (-> (get-by-id integration (get json "entity_id"))
               (:order)
               (assoc :client-code client
                      :client-location location))

src/clj/auto_ap/graphql/checks.clj

@@ -75,9 +75,9 @@
             amount (str "--" (.format df  amount) "--")]
         [:table {:num-cols 12 :border false :leading 11 :widths (distribute [2 3 3 3 3 3 3 3 3 2 2 2])}
          [(let [{:keys [:client/name] {:keys [:address/street1 :address/city :address/state :address/zip]} :client/address} client]
-            [:cell {:colspan 4 } [:paragraph {:leading 14} name "\n" street1 "\n" (str city ", " state " " zip)] ])
+            [:cell {:colspan 5 } [:paragraph {:leading 14} name "\n" street1 "\n" (str city ", " state " " zip)] ])
           (let [{:keys [:bank-account/bank-name :bank-account/bank-code] } bank-account]
-            [:cell {:colspan 6 :align :center} [:paragraph {:style :bold} bank-name] [:paragraph {:size 8 :leading 8} bank-code]])
+            [:cell {:colspan 5 :align :center} [:paragraph {:style :bold} bank-name] [:paragraph {:size 8 :leading 8} bank-code]])
           [:cell {:colspan 2 :size 13}
            check]]
 

src/clj/auto_ap/graphql/transactions.clj

@@ -428,7 +428,8 @@
     (let [payment-tx (i-transactions/add-new-payment (dc/pull db [:transaction/amount :transaction/date :db/id] transaction_id)
                                                      (map (fn [id]
                                                             (let [entity (dc/pull db [:invoice/vendor :db/id :invoice/total] id)]
-                                                              [(-> entity :invoice/vendor :db/id)
+                                                              [(or (-> entity :invoice/vendor :db/id)
+                                                                   (-> entity :invoice/vendor))
                                                                (-> entity :db/id)
                                                                (-> entity :invoice/total)]))
                                                           autopay_invoice_ids)
@@ -466,7 +467,8 @@
     (let [payment-tx (i-transactions/add-new-payment (dc/pull db [:transaction/amount :transaction/date :db/id] transaction_id)
                                              (map (fn [id]
                                                     (let [entity (dc/pull db [:invoice/vendor :db/id :invoice/total] id)]
-                                                      [(-> entity :invoice/vendor :db/id)
+                                                      [(or (-> entity :invoice/vendor :db/id)
+                                                           (-> entity :invoice/vendor))
                                                        (-> entity :db/id)
                                                        (-> entity :invoice/total)]))
                                                   unpaid_invoice_ids)

src/clj/auto_ap/jobs/ntg.clj

@@ -70,13 +70,15 @@
          (drop 1)
          (filter (fn [[_ _ _ _ _ _ _ _ _ _ _ break-flag]]
                    (= "Y" break-flag)))
-         (map (fn [[vendor location-hint invoice-number ship-date invoice-total ]]
+         (map (fn [[_ location-hint invoice-number ship-date invoice-total ]]
                 (let [matching-client (and location-hint
-                                           (parse/exact-match clients location-hint))]
+                                           (parse/exact-match clients location-hint))
+                      location (parse/best-location-match matching-client location-hint location-hint )
+                      vendor (d/pull (d/db conn) '[:vendor/default-account] :vendor/general-produce)]
                   (when-not matching-client
                     (log/warn ::missing-client
                               :client-hint location-hint))
-                  {:invoice/location            (parse/best-location-match matching-client location-hint location-hint )
+                  {:invoice/location            location
                    :invoice/date                (coerce/to-date (atime/parse ship-date atime/normal-date))
                    :invoice/invoice-number      invoice-number
                    :invoice/total               (Double/parseDouble invoice-total)
@@ -86,7 +88,11 @@
                    :invoice/import-status       :import-status/imported
                    :invoice/status              :invoice-status/unpaid
                    :invoice/client-identifier   location-hint
-                   })))
+                   :invoice/expense-accounts [{:invoice-expense-account/account
+                                               (-> vendor :vendor/default-account :db/id)
+                                               :invoice-expense-account/location location
+                                               :invoice-expense-account/amount   (Math/abs (Double/parseDouble invoice-total))
+                                               }]})))
          (filter :invoice/client)
          (into []))
     (catch Exception e
@@ -228,11 +234,8 @@
                                                                            :client/locations])
                                                            :where [?c :client/code]]
                                                          (d/db conn)))]
-                             
-
                              (log/info ::found-invoice-keys
                                        :keys keys )
-                             
                              (let [transaction (->> keys
                                                     (mapcat (fn [k]
                                                               (try 
@@ -249,7 +252,10 @@
                                                                                           :invoice i)
                                                                                 i))
                                                                          (mapv (fn [i]
-                                                                                 [:propose-invoice (assoc i :invoice/source-url invoice-url)]))))) (catch Exception e
+                                                                                 (if (= :vendor/cintas (:invoice/vendor i))
+                                                                                   [:propose-invoice (assoc i :invoice/source-url invoice-url)]
+                                                                                   [:propose-invoice i]))))))
+                                                                (catch Exception e
                                                                   (log/error ::cant-load-file
                                                                              :key k
                                                                              :exception e)

src/clj/auto_ap/ssr/company/company_1099.clj

@@ -194,9 +194,14 @@
 (defn form-data->map [form-data]
   (reduce-kv
     (fn [acc k v]
+      (cond (and (string? v)
+                 (empty? v))
+            acc
+
+            :else
             (assoc-in acc (->> (str/split k #"_")
                                (mapv #(apply keyword (str/split % #"/"))))
-                v))
+                      v)))
     {}
     form-data))
 
@@ -213,8 +218,8 @@
     @(dc/transact conn [(remove-nils
                           (-> (form-data->map form-params)
                               (assoc :db/id (Long/parseLong (:vendor-id route-params)))
-                              (update :vendor/legal-entity-1099-type #(some->> % (keyword "legal-entity-1099-type")))
+                              (update :vendor/legal-entity-1099-type #(some->> % not-empty (keyword "legal-entity-1099-type")))
-                              (update :vendor/legal-entity-tin-type #(some->> % (keyword "legal-entity-tin-type")))))]))
+                              (update :vendor/legal-entity-tin-type #(some->> % not-empty (keyword "legal-entity-tin-type")))))]))
   (html-response 
     (table request :flash-id (Long/parseLong (:vendor-id route-params)))))
 

terraform/deploy.tf

@@ -479,7 +479,7 @@ module "ntg_job" {
        stage = var.stage
        job_name = "ntg"
        execution_role_arn = var.execution_role_arn
-       use_schedule = false
+       use_schedule = true
        memory = 4096
        cpu = 1024
 }

terraform/terraform.tfstate.d/prod/terraform.tfstate

@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "1.4.2",
-  "serial": 416,
+  "serial": 422,
   "lineage": "9b630886-8cee-a57d-c7a2-4f19f13f9c51",
   "outputs": {
     "aws_access_key_id": {
@@ -164,7 +164,7 @@
             ],
             "tags": {},
             "tags_all": {},
-            "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:535",
+            "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:538",
             "timeouts": {
               "delete": null
             },
@@ -1894,6 +1894,101 @@
         }
       ]
     },
+    {
+      "module": "module.ntg_job",
+      "mode": "managed",
+      "type": "aws_cloudwatch_event_rule",
+      "name": "schedule",
+      "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
+      "instances": [
+        {
+          "index_key": 0,
+          "schema_version": 0,
+          "attributes": {
+            "arn": "arn:aws:events:us-east-1:679918342773:rule/ntg-schedule",
+            "description": "",
+            "event_bus_name": "default",
+            "event_pattern": null,
+            "id": "ntg-schedule",
+            "is_enabled": true,
+            "name": "ntg-schedule",
+            "name_prefix": "",
+            "role_arn": "",
+            "schedule_expression": "rate(6 hours)",
+            "tags": null,
+            "tags_all": {}
+          },
+          "sensitive_attributes": [],
+          "private": "bnVsbA=="
+        }
+      ]
+    },
+    {
+      "module": "module.ntg_job",
+      "mode": "managed",
+      "type": "aws_cloudwatch_event_target",
+      "name": "job_target",
+      "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
+      "instances": [
+        {
+          "index_key": 0,
+          "schema_version": 1,
+          "attributes": {
+            "arn": "arn:aws:ecs:us-east-1:679918342773:cluster/default",
+            "batch_target": [],
+            "dead_letter_config": [],
+            "ecs_target": [
+              {
+                "enable_ecs_managed_tags": false,
+                "enable_execute_command": false,
+                "group": "",
+                "launch_type": "",
+                "network_configuration": [
+                  {
+                    "assign_public_ip": true,
+                    "security_groups": [
+                      "sg-004e5855310c453a3",
+                      "sg-02d167406b1082698"
+                    ],
+                    "subnets": [
+                      "subnet-5e675761",
+                      "subnet-8519fde2",
+                      "subnet-89bab8d4"
+                    ]
+                  }
+                ],
+                "placement_constraint": [],
+                "platform_version": "",
+                "propagate_tags": "TASK_DEFINITION",
+                "tags": null,
+                "task_count": 1,
+                "task_definition_arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/ntg_prod:1"
+              }
+            ],
+            "event_bus_name": "default",
+            "http_target": [],
+            "id": "ntg-schedule-ntg",
+            "input": "",
+            "input_path": "",
+            "input_transformer": [],
+            "kinesis_target": [],
+            "redshift_target": [],
+            "retry_policy": [],
+            "role_arn": "arn:aws:iam::679918342773:role/service-role/Amazon_EventBridge_Invoke_ECS_1758992733",
+            "rule": "ntg-schedule",
+            "run_command_targets": [],
+            "sqs_target": [],
+            "target_id": "ntg"
+          },
+          "sensitive_attributes": [],
+          "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ==",
+          "dependencies": [
+            "module.ntg_job.aws_cloudwatch_event_rule.schedule",
+            "module.ntg_job.aws_ecs_task_definition.background_taskdef"
+          ]
+        }
+      ]
+    },
     {
       "module": "module.ntg_job",
       "mode": "managed",
@@ -1923,7 +2018,7 @@
             ],
             "revision": 1,
             "runtime_platform": [],
-            "tags": null,
+            "tags": {},
             "tags_all": {},
             "task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb",
             "volume": []

terraform/terraform.tfstate.d/prod/terraform.tfstate.backup

@@ -1,7 +1,7 @@
 {
   "version": 4,
   "terraform_version": "1.4.2",
-  "serial": 411,
+  "serial": 416,
   "lineage": "9b630886-8cee-a57d-c7a2-4f19f13f9c51",
   "outputs": {
     "aws_access_key_id": {
@@ -164,7 +164,7 @@
             ],
             "tags": {},
             "tags_all": {},
-            "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:520",
+            "task_definition": "arn:aws:ecs:us-east-1:679918342773:task-definition/integreat_app_prod:535",
             "timeouts": {
               "delete": null
             },
@@ -1443,7 +1443,7 @@
             ],
             "revision": 1,
             "runtime_platform": [],
-            "tags": null,
+            "tags": {},
             "tags_all": {},
             "task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb",
             "volume": []
@@ -1894,6 +1894,45 @@
         }
       ]
     },
+    {
+      "module": "module.ntg_job",
+      "mode": "managed",
+      "type": "aws_ecs_task_definition",
+      "name": "background_taskdef",
+      "provider": "provider[\"registry.terraform.io/hashicorp/aws\"]",
+      "instances": [
+        {
+          "schema_version": 1,
+          "attributes": {
+            "arn": "arn:aws:ecs:us-east-1:679918342773:task-definition/ntg_prod:1",
+            "container_definitions": "[{\"cpu\":0,\"dockerLabels\":{\"com.datadoghq.tags.env\":\"prod\",\"com.datadoghq.tags.service\":\"ntg\"},\"environment\":[{\"name\":\"DD_CONTAINER_ENV_AS_TAGS\",\"value\":\"{\\\"INTEGREAT_JOB\\\":\\\"background_job\\\"}\"},{\"name\":\"DD_ENV\",\"value\":\"prod\"},{\"name\":\"DD_SERVICE\",\"value\":\"ntg\"},{\"name\":\"INTEGREAT_JOB\",\"value\":\"ntg\"},{\"name\":\"config\",\"value\":\"/usr/local/config/prod-background-worker.edn\"}],\"essential\":true,\"image\":\"679918342773.dkr.ecr.us-east-1.amazonaws.com/integreat:prod\",\"logConfiguration\":{\"logDriver\":\"awslogs\",\"options\":{\"awslogs-group\":\"/ecs/integreat-background-worker-prod\",\"awslogs-region\":\"us-east-1\",\"awslogs-stream-prefix\":\"ecs\"}},\"mountPoints\":[],\"name\":\"integreat-app\",\"portMappings\":[{\"containerPort\":9000,\"hostPort\":9000,\"protocol\":\"tcp\"},{\"containerPort\":9090,\"hostPort\":9090,\"protocol\":\"tcp\"}],\"volumesFrom\":[]},{\"cpu\":0,\"environment\":[{\"name\":\"DD_API_KEY\",\"value\":\"ce10d932c47b358e81081ae67bd8c112\"},{\"name\":\"ECS_FARGATE\",\"value\":\"true\"}],\"essential\":true,\"image\":\"public.ecr.aws/datadog/agent:latest\",\"mountPoints\":[],\"name\":\"datadog-agent\",\"portMappings\":[],\"volumesFrom\":[]}]",
+            "cpu": "1024",
+            "ephemeral_storage": [],
+            "execution_role_arn": "arn:aws:iam::679918342773:role/ecsTaskExecutionRole",
+            "family": "ntg_prod",
+            "id": "ntg_prod",
+            "inference_accelerator": [],
+            "ipc_mode": "",
+            "memory": "4096",
+            "network_mode": "awsvpc",
+            "pid_mode": "",
+            "placement_constraints": [],
+            "proxy_configuration": [],
+            "requires_compatibilities": [
+              "FARGATE"
+            ],
+            "revision": 1,
+            "runtime_platform": [],
+            "tags": null,
+            "tags_all": {},
+            "task_role_arn": "arn:aws:iam::679918342773:role/datomic-ddb",
+            "volume": []
+          },
+          "sensitive_attributes": [],
+          "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjEifQ=="
+        }
+      ]
+    },
     {
       "module": "module.plaid_job",
       "mode": "managed",