Add transaction adjustment on cancellation (when amount differs)

.gitea/workflows/build-docker-image.yaml

@@ -29,8 +29,6 @@ jobs:
               with:
                 platforms: linux/amd64
                 push: true
-                build-args: |
-                  APP_URL="${{ vars.APP_URL }}"
                 tags: gitea.stuzer.link/stuzer05/monobank-firefly3-bot:latest
                 cache-from: type=registry,ref=gitea.stuzer.link/stuzer05/monobank-firefly3-bot:latest
                 cache-to: type=inline

Dockerfile

@@ -1,8 +1,11 @@
 FROM golang:1.23.2 AS builder
 
+# Install certificates
+RUN apt-get update && apt-get install -y ca-certificates
+
 WORKDIR /app
 
-COPY go.mod go.sum ./
+COPY go.mod go.sum .
 
 RUN go mod download && go mod verify
 
@@ -14,7 +17,6 @@ RUN make
 
 FROM scratch
 
-COPY --from=builder /etc/ssl/* /etc/ssl
 COPY --from=builder /app/monobank-firefly3-bot /app
 
 ENTRYPOINT ["/app"]

app/import_transaction.go

@@ -55,7 +55,7 @@ func ImportTransaction(monobankTransaction monobank.WebHookResponse) error {
 				return err
 			}
 
-			// find matching transaction to delete
+			// find matching transaction to adjust/delete
 			isDeleted := false
 			for _, tRows := range oldTransactions.Data {
 				if isDeleted {
@@ -70,24 +70,54 @@ func ImportTransaction(monobankTransaction monobank.WebHookResponse) error {
 					}
 
 					// read monobank transaction
-					var monobankTransaction monobank.WebHookResponse
+					var monobankTransactionOld monobank.WebHookResponse
-					err = json.Unmarshal(notesBytes, &monobankTransaction)
+					err = json.Unmarshal(notesBytes, &monobankTransactionOld)
 					if err != nil {
 						continue
 					}
 
+					// Parse amounts
+					sumNew := int64(math.Abs(math.Round(monobankTransaction.Data.StatementItem.Amount/100))) - int64(math.Abs(math.Round(monobankTransaction.Data.StatementItem.CommissionRate/100)))
+					sumOldFloat, _ := strconv.ParseFloat(tRow.Amount, 64)
+					sumOld := int64(sumOldFloat)
+
 					// find transaction
-					sum := int(math.Abs(math.Round(monobankTransaction.Data.StatementItem.Amount/100))) - int(math.Abs(math.Round(monobankTransaction.Data.StatementItem.CommissionRate/100)))
+					if slices.Contains(row.Names, monobankTransactionOld.Data.StatementItem.Description) {
-					sum2, _ := strconv.ParseFloat(tRow.Amount, 64)
+						if sumNew == sumOld {
-					if slices.Contains(row.Names, monobankTransaction.Data.StatementItem.Description) && sum == int(sum2) {
+							// delete transaction
-						// delete transaction
+							opts := firefly3.TransactionsApiDeleteTransactionOpts{}
-						opts := firefly3.TransactionsApiDeleteTransactionOpts{}
+							_, err := App().Firefly3Client.TransactionsApi.DeleteTransaction(context.Background(), tRows.Id, &opts)
-						_, err := App().Firefly3Client.TransactionsApi.DeleteTransaction(context.Background(), tRows.Id, &opts)
+							if err != nil {
-						if err != nil {
+								return err
-							return err
+							}
+						} else {
+							// adjust transaction
+							opts := firefly3.TransactionsApiUpdateTransactionOpts{}
+							body := firefly3.TransactionUpdate{
+								Transactions: []firefly3.TransactionSplitUpdate{
+									{
+										Description:   tRow.Description,
+										CategoryId:    tRow.CategoryId,
+										DestinationId: tRow.DestinationId,
+										SourceId:      tRow.SourceId,
+										CurrencyId:    tRow.CurrencyId,
+										ExternalUrl:   tRow.ExternalUrl,
+										Date:          tRow.Date,
+										DueDate:       tRow.DueDate,
+										Tags:          tRow.Tags,
+										Notes:         tRow.Notes,
+										// Notes:         string(monobankTransactionJson),
+										Amount: strconv.FormatInt(sumOld-sumNew, 10),
+									},
+								},
+							}
+							_, _, err := App().Firefly3Client.TransactionsApi.UpdateTransaction(context.Background(), body, tRows.Id, &opts)
+							if err != nil {
+								return err
+							}
 						}
 
-						isDeleted = true
+						isDeleted = true // break 2
 					}
 				}
 			}

webhook.go

@@ -9,6 +9,10 @@ import (
 )
 
 func handleWebhook(w http.ResponseWriter, r *http.Request) {
+	// Parse URL query parameters
+	queryParams := r.URL.Query()
+	isRetry := queryParams.Get("retry") == "true"
+
 	// read request body bytes
 	body, err := io.ReadAll(r.Body)
 	if err != nil {
@@ -36,14 +40,16 @@ func handleWebhook(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// check if transaction hs been logged
+	// only check for logged transaction if not a retry
-	isTransactionAlreadyLogged, err := app.LogContainsTransactionID(monobankTransaction.Data.StatementItem.Id)
+	if !isRetry {
-	if err != nil {
+		isTransactionAlreadyLogged, err := app.LogContainsTransactionID(monobankTransaction.Data.StatementItem.Id)
-		app.LogString(err.Error())
+		if err != nil {
-		return
+			app.LogString(err.Error())
-	}
+			return
-	if isTransactionAlreadyLogged {
+		}
-		return
+		if isTransactionAlreadyLogged {
+			return
+		}
 	}
 
 	err = app.ImportTransaction(monobankTransaction)