unipump 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47b3ded4adb8542b7c97b5163ad60d83b2415ded901121e205451977d2269fcf
-  data.tar.gz: 62853432f82b5cd7a64ec0ad16fb24efe8e71a2ab59e7aab7e0971dff6f09065
+  metadata.gz: 70ddfc228cd9746dacb4d8d00a4f7cc66a3e2c6880e62a5dc2a4ed9b8aef4b26
+  data.tar.gz: 52e3a1838db7e54a52fb62b27439ef210943fce3d7a18b3615e48a405fb5a9fb
 SHA512:
-  metadata.gz: 00c5a85ec55dfb5e29fd2a01d7255a2fd08b421686bb2d23f5aa1f8c7ca3a455061f23e7940d9b0efc170ca337fcd02a3048f7cea526e98e2a6e690d39e8095a
-  data.tar.gz: 3d2350a002c0e4f4b569ee7fb39868d036cd896e04954143b9a774d766af48c36b398deb69c738efd4136745931a9865b107a97bd23648045a0d0d6c16706b0a
+  metadata.gz: 35a18fdafddafdeb0ca76c5dedd89162c7934a9df88e62dfc0d0e655179184291bce1d326e9d79267d7f249c279dc117811bb11d436b7c2b0f1686f0ace1064d
+  data.tar.gz: '0907dbe7141953a1f694f035965d76d4a7509f40cccb6204ca4fa18aea5438b85b5f1a6b7014b07ff301caacd37931494a3e15dfc76d54010b6dd46b34d0e0a3'

data/exe/unipump

@@ -16,7 +16,7 @@ SPEC = %(
   absent 
 
   -e,environment=ENV
-    Set the run-time environment to 'production' or 'test'. In the test
+    Set the run-time environment to 'prod' or 'test'. In the test
     environment, data will be uploaded to the Uniconta test system and
     TIMEREG_TEST is updated in the database instead of the TIMEREG table. The
     default is 'test'

data/lib/unipump/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UniPump
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/unipump.rb

@@ -37,7 +37,7 @@ class Pump
 
   # Environment-dependent constants
   TEST_SYSTEM = "81470" # Uniconta test system ID
-  PROD_SYSTEM = nil
+  PROD_SYSTEM = "86837"
   TEST_TIMEREG_TABLE = "tidsreg_test"
   PROD_TIMEREG_TABLE = "tidsreg"
   TEST_FAKTURALINIE_VIEW = "v_fakturalinie_test"
@@ -66,9 +66,9 @@ class Pump
   def tidsreg_table = (environment == "prod" ? PROD_TIMEREG_TABLE : TEST_TIMEREG_TABLE)
   def fakturalinie_view = (environment == "prod" ? PROD_FAKTURALINIE_VIEW : TEST_FAKTURALINIE_VIEW)
   def root_url = "https://odata.uniconta.com/api/Entities/#{system}"
-  def order_list_url = "#{root_url}/DebtorOrderClient"
-  def insert_order_list_url = "#{root_url}/InsertList/DebtorOrderClient"
-  def insert_order_line_list_url = "#{root_url}/InsertList/DebtorOrderLineClient"
+  def order_list_url = "#{root_url}/DebtorOrderClientUser"
+  def insert_order_list_url = "#{root_url}/InsertList/DebtorOrderClientUser"
+  def insert_order_line_list_url = "#{root_url}/InsertList/DebtorOrderLineClientUser"
 
   def initialize(
       username, password, environment,
@@ -177,14 +177,13 @@ class Pump
       # that we may recover from a database failure after the order lines
       # have been uploaded
       tidsreg_keys = conn.records %(
-        select 
+        select distinct
           meid,
           said,
           acid,
           dato
         from #{fakturalinie_view}
         where #{line_constraint}
-        order by sagsnummer
       )
 
       # Save tidsreg keys to disk
@@ -213,7 +212,7 @@ class Pump
       emit "    #{order.ordrenummer} (#{order.sagsnummer}) #{order_lines.size} items"
 
       # Create json object for HTTP
-      json = format_order_line(order, order_lines)
+      json = format_order_line(order, order_lines, end_date)
 
       # Transfer JSON document. Note that HTTP redirects are not supported
       # (yet)
@@ -264,7 +263,6 @@ private
   end
 
   def upload_json(url, json) # ChatGPT
-    return
     # Write to json log
     File.open(jlog, "a") { |f| f.puts json } if jlog 
 
@@ -374,10 +372,11 @@ private
     " }" + curr_comma
   end
 
-  def format_blank_line(out, ordrenummer)
+  def format_blank_line(out, ordrenummer, end_date)
     format_fields(
         out,
         "OrderNumber" => ordrenummer, 
+        "PumpDate" => "#{end_date}T12:00:00",
         "Text" => ""
     )
   end
@@ -397,7 +396,7 @@ private
     out.string
   end
 
-  def format_order_line(order, order_lines)
+  def format_order_line(order, order_lines, end_date)
     @curr_comma = ","
     out = StringIO.new
     out.puts "[" 
@@ -405,31 +404,30 @@ private
       prev_rolle = nil
       prev_maaned = nil
       for order_line in order_lines
+        # header
         if prev_rolle != order_line.rolle || prev_maaned != order_line.maaned
-          format_blank_line(out, order_line.ordrenummer.to_i) if !prev_rolle.nil? && !prev_maaned.nil?
+          format_blank_line(out, order_line.ordrenummer.to_i, end_date) if !prev_rolle.nil? && !prev_maaned.nil?
           format_fields(out,
               "OrderNumber" => order_line.ordrenummer.to_i, 
+              "PumpDate" => "#{end_date}T12:00:00",
               "Text" => order_line.rolle)
           prev_rolle = order_line.rolle
           prev_maaned = order_line.maaned
         end
+        # body
         format_fields(out,
             "OrderNumber" => order_line.ordrenummer.to_i, 
+            "PumpDate" => "#{end_date}T12:00:00",
             "Text" => "  #{order_line.tekst}",
             "Item" => order_line.ydelse, 
             "Qty" => order_line.antal, 
             "Price" => order_line.pris)
       end
       @curr_comma = ""
-      format_blank_line(out, order_line.ordrenummer.to_i)
+      format_blank_line(out, order_line.ordrenummer.to_i, end_date)
     }
     out.puts "]"
     out.string
   end
 end
 
-
-
-
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unipump
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-21 00:00:00.000000000 Z
+date: 2024-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tiny_tds