Merge GH-17: tests reporting

Signed-off-by: 35V LG84 <35vlg84-x4e6b92@e257.fi>

CHANGELOG.adoc

@@ -36,7 +36,9 @@ New features:
 
 ==== Fixes
 
-Fixes in this release: none
+Fixes in this release:
+
+* Register report: Tackler-mkI compatible output
 
 
 ==== Development

examples/tackler.toml

@@ -1,12 +1,12 @@
-### Configuration settings for Tackler-NG
+### The main configuration file for Tackler-NG
 ###
-### The format of this file is TOML (https://toml.io/en/)
+### The format is TOML (https://toml.io/en/)
 [kernel]
 ### Stric mode
 ###
 ### When this is true, then all accounts, commodities and tags
-### must be predefined.  If there is an undefined item,
-### it's fatal halting error.
+### must be predefined. It's fatal halting error,
+### if there is an undefined item in the transaction data.
 ###
 ### Valid options are: true | false
 ### CLI: --strict.mode
@@ -71,8 +71,6 @@ hash = "SHA-256"
 ### CLI: --audit.mode
 mode = true
 
-
-
 ### Transaction Input Configuration
 [kernel.input]
 ### Type of input storage system

tackler-core/src/model/register.rs

@@ -19,6 +19,7 @@ use crate::config::Scale;
 use crate::model::{Posting, Transaction};
 use rust_decimal::{Decimal, RoundingStrategy};
 use std::cmp::{max, Ordering};
+use std::fmt::Write;
 use std::fmt::{Display, Formatter};
 use tackler_api::txn_ts;
 use time::OffsetDateTime;
@@ -73,35 +74,43 @@ impl<'a> RegisterEntry<'a> {
         tz: &'static Tz,
         scale: &Scale,
     ) -> String {
+        fn amount_to_string(amount: &Decimal, scale: &Scale, width: usize) -> String {
+            let prec = scale.get_precision(amount);
+            let amount_txt = format!(
+                "{:.prec$}",
+                amount.round_dp_with_strategy(prec as u32, RoundingStrategy::MidpointAwayFromZero)
+            );
+
+            if amount.is_sign_positive() && amount_txt.chars().count() >= width {
+                format!(" {}", amount_txt)
+            } else {
+                amount_txt
+            }
+        }
+
         let indent = " ".repeat(12);
         let mut line_len = 0;
-        let mut s = self.txn.header.to_string_with_indent(&indent, ts_fmtr, tz);
+        let mut reg_entry_txt = self.txn.header.to_string_with_indent(&indent, ts_fmtr, tz);
 
         for p in &self.posts {
             let comm = &p.post.acctn.comm;
 
-            let prec_1 = scale.get_precision(&p.post.amount);
-            let prec_2 = scale.get_precision(&p.amount);
-
             let line = format!(
-                "{}{:<33}{:>18.prec_1$} {:>18.prec_2$}{}",
+                "{}{:<33}{:>18} {:>18}{}",
                 indent,
                 p.post.acctn.atn.account,
-                p.post
-                    .amount
-                    .round_dp_with_strategy(prec_1 as u32, RoundingStrategy::MidpointAwayFromZero),
-                p.amount
-                    .round_dp_with_strategy(prec_2 as u32, RoundingStrategy::MidpointAwayFromZero),
+                amount_to_string(&p.post.amount, scale, 18),
+                amount_to_string(&p.amount, scale, 18),
                 match &comm.is_some() {
                     true => format!(" {}", comm.name),
                     false => String::new(),
                 },
             );
             line_len = max(line_len, line.chars().count());
-            s += &line;
-            s += "\n";
+            let _ = writeln!(reg_entry_txt, "{}", line);
         }
-        format!("{s}{}\n", "-".repeat(line_len))
+        let _ = writeln!(reg_entry_txt, "{}", "-".repeat(line_len));
+        reg_entry_txt
     }
 }
 impl<'a> Display for RegisterEntry<'a> {

tests/sh/lib/utils.sh

@@ -19,8 +19,14 @@ cmp_result () {
     local test_name=$2
     local suffix=$3
     local target=$4
+    local ok_path="$5"
 
-    ref=$SUITE_PATH/$module/ok/$test_name.ref.$target.$suffix
+    if [ "x$ok_path" == "x" ]; then
+	ok="ok"
+    else
+	ok=$ok_path
+    fi
+    ref=$SUITE_PATH/$module/$ok/$test_name.ref.$target.$suffix
     out=$OUTPUT_DIR/$test_name.$target.$suffix
 
     cmp $ref $out || {

tests/sh/reporting-equity.sh

@@ -0,0 +1,123 @@
+#
+# Copyright 2024 E257.FI
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -e
+
+source $TEST_DIR/lib/utils.sh
+
+
+###
+### REPORTING / EQUITY
+###
+module=reporting/equity
+
+#####################################################################
+#
+# equity-acc-01
+#
+# test: 29d24d2e-702f-4c27-b5de-82ac88ca68ca
+rm -f $OUTPUT_DIR/*
+test_name=equity-acc-01-ng
+echo "test: $module/$test_name: "
+
+$TACKLER_SH \
+    --input.file $SUITE_PATH/$module/../ok/reporting.txn \
+    --output.dir $OUTPUT_DIR \
+    --output.prefix $test_name \
+    --config $SUITE_PATH/$module/../ok.equity-acc.toml 
+
+echo -n "check:"
+cmp_result $module $test_name txt bal "."
+cmp_result $module $test_name txt balgrp "."
+cmp_result $module $test_name txt reg "."
+cmp_result $module $test_name txn equity "."
+cmp_result $module $test_name txn identity "."
+echo ": ok"
+
+#####################################################################
+#
+# equity-tep1014-02
+#
+# This is variant of c0b34ebb-a5d2-4b09-96cb-2594b3635650 with
+# maximum precision points of rust-decimal
+#
+# test: 8542680a-2e94-437f-b0a5-cdef46ef8521
+rm -f $OUTPUT_DIR/*
+test_name=equity-tep1014-01-ng
+echo "test: $module/$test_name: "
+
+$TACKLER_SH \
+    --input.file $SUITE_PATH/$module/../big-and-small.txn \
+    --output.dir $OUTPUT_DIR \
+    --output.prefix $test_name \
+    --config $SUITE_PATH/$module/../ok.equity-tep1014.toml 
+
+echo -n "check:"
+cmp_result $module $test_name txt bal "."
+cmp_result $module $test_name txn equity "."
+echo ": ok"
+
+
+#####################################################################
+#
+# equity-tep1014-as-input
+#
+# This is variant of 78982e06-4f11-4f52-8689-df400b8c3a93 with
+# maximum precision points of rust-decimal
+#
+# test: c2e27940-a141-41ed-adc2-da294d519804
+rm -f $OUTPUT_DIR/*
+test_name=equity-tep1014-as-input
+echo "test: $module/$test_name: "
+
+mkdir -p $OUTPUT_DIR/txnsout
+
+$TACKLER_SH \
+    --config $SUITE_PATH/$module/../ok.equity-tep1014.toml \
+    --input.file $SUITE_PATH/$module/../big-and-small.txn \
+    --output.dir $OUTPUT_DIR/txnsout \
+    --output.prefix equity-tep1014-input-01 \
+
+$TACKLER_SH \
+    --config $SUITE_PATH/$module/../ok.equity-tep1014.toml \
+    --input.file $SUITE_PATH/$module/equity-tep1014-as-input.txn \
+    --output.dir $OUTPUT_DIR/txnsout \
+    --output.prefix equity-tep1014-input-02 \
+    --accounts 'a(:.*)?' \
+
+$TACKLER_SH \
+    --config $SUITE_PATH/$module/../ok.equity-tep1014.toml \
+    --input.file $SUITE_PATH/$module/equity-tep1014-as-input2.txn \
+    --output.dir $OUTPUT_DIR/txnsout \
+    --output.prefix equity-tep1014-input-03 \
+    --accounts 'a(:.*)?' 'e(:.*)?' \
+
+$TACKLER_SH \
+    --config $SUITE_PATH/$module/../ok.equity-tep1014.toml \
+    --input.fs.dir  $OUTPUT_DIR/txnsout \
+    --input.fs.ext "txn" \
+    --output.dir $OUTPUT_DIR \
+    --output.prefix $test_name-ng \
+    --accounts 'a(:.*)?' 'e(:.*)?' \
+    --exports "identity" \
+
+
+echo -n "check:"
+cmp_result $module $test_name-ng txn identity "."
+echo ": ok"
+
+
+