adjust dates

ananthakumaran · Feb 11, 2024 · 62401a4 · 62401a4
1 parent c1c0f38
commit 62401a4
Show file tree

Hide file tree

Showing 29 changed files with 1,089 additions and 1,129 deletions.
diff --git a/internal/query/posting.go b/internal/query/posting.go
@@ -130,7 +130,7 @@ func (q *Query) All() []posting.Posting {
 	var postings []posting.Posting
 
 	q.context = q.context.Where("forecast = ?", q.includeForecast)
-	result := q.context.Order("date " + q.order + ", amount desc").Find(&postings)
+	result := q.context.Order("date " + q.order + ", amount desc, account asc").Find(&postings)
 	if result.Error != nil {
 		log.Fatal(result.Error)
 	}
@@ -140,7 +140,7 @@ func (q *Query) All() []posting.Posting {
 func (q *Query) First() *posting.Posting {
 	var posting posting.Posting
 	q.context = q.context.Where("forecast = ?", q.includeForecast)
-	result := q.context.Order("date " + q.order + ", amount desc").First(&posting)
+	result := q.context.Order("date " + q.order + ", amount desc, account asc").First(&posting)
 
 	if result.Error != nil {
 		if errors.Is(result.Error, gorm.ErrRecordNotFound) {

diff --git a/tests/fixture/inr-beancount/allocation.json b/tests/fixture/inr-beancount/allocation.json
@@ -105,12 +105,7 @@
       "Assets:Checking": {
         "date": "2022-01-08T00:00:00Z",
         "account": "Assets:Checking",
-        "market_amount": 1974.6829928704
-      },
-      "Assets:Equity:AAPL": {
-        "date": "2022-01-08T00:00:00Z",
-        "account": "Assets:Equity:AAPL",
-        "market_amount": 10000
+        "market_amount": 11974.6829928704
       },
       "Assets:Equity:ABNB": {
         "date": "2022-01-08T00:00:00Z",
@@ -127,17 +122,12 @@
       "Assets:Checking": {
         "date": "2022-01-09T00:00:00Z",
         "account": "Assets:Checking",
-        "market_amount": 11097.2625128704
-      },
-      "Assets:Dollar": {
-        "date": "2022-01-09T00:00:00Z",
-        "account": "Assets:Dollar",
-        "market_amount": 804.42048
+        "market_amount": 1974.6829928704
       },
       "Assets:Equity:AAPL": {
         "date": "2022-01-09T00:00:00Z",
         "account": "Assets:Equity:AAPL",
-        "market_amount": 0
+        "market_amount": 10000
       },
       "Assets:Equity:ABNB": {
         "date": "2022-01-09T00:00:00Z",
@@ -154,17 +144,7 @@
       "Assets:Checking": {
         "date": "2022-01-10T00:00:00Z",
         "account": "Assets:Checking",
-        "market_amount": 11097.22810619763
-      },
-      "Assets:Coinbase:BTC": {
-        "date": "2022-01-10T00:00:00Z",
-        "account": "Assets:Coinbase:BTC",
-        "market_amount": 0
-      },
-      "Assets:Dollar": {
-        "date": "2022-01-10T00:00:00Z",
-        "account": "Assets:Dollar",
-        "market_amount": 804.42048
+        "market_amount": 12001.6829928704
       },
       "Assets:Equity:AAPL": {
         "date": "2022-01-10T00:00:00Z",
@@ -186,12 +166,7 @@
       "Assets:Checking": {
         "date": "2022-01-11T00:00:00Z",
         "account": "Assets:Checking",
-        "market_amount": 11097.22810619763
-      },
-      "Assets:Coinbase:BTC": {
-        "date": "2022-01-11T00:00:00Z",
-        "account": "Assets:Coinbase:BTC",
-        "market_amount": 0
+        "market_amount": 11097.2625128704
       },
       "Assets:Dollar": {
         "date": "2022-01-11T00:00:00Z",
@@ -762,7 +737,7 @@
       "Assets:Checking": {
         "date": "2022-01-29T00:00:00Z",
         "account": "Assets:Checking",
-        "market_amount": 11097.22810619763
+        "market_amount": 12169.22810619763
       },
       "Assets:Coinbase:BTC": {
         "date": "2022-01-29T00:00:00Z",

diff --git a/tests/fixture/inr-beancount/assets_balance.json b/tests/fixture/inr-beancount/assets_balance.json
@@ -7,7 +7,7 @@
       "marketAmount": 102155.81133819763,
       "balanceUnits": 0,
       "latestPrice": 0,
-      "xirr": 12.15,
+      "xirr": 12.14,
       "gainAmount": 13414.62810619763,
       "absoluteReturn": 0.1358193262974935
     },
@@ -18,7 +18,7 @@
       "marketAmount": 13169.22810619763,
       "balanceUnits": 0,
       "latestPrice": 0,
-      "xirr": 44.43,
+      "xirr": 44.27,
       "gainAmount": 13169.22810619763,
       "absoluteReturn": 0
     },