From 3b72e1305b24ecca0be487506b21363584a474fd Mon Sep 17 00:00:00 2001
From: William Brawner <me@wbrawner.com>
Date: Sun, 22 Mar 2020 21:59:02 +0000
Subject: [PATCH] Fix transaction creation

Signed-off-by: William Brawner <me@wbrawner.com>
---
 lib/Controller/TransactionController.php      |  10 +-
 .../Version000001Date20200204101200.php       |   2 +-
 .../transaction/TransactionForm.vue           | 148 +++++++++---------
 3 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/lib/Controller/TransactionController.php b/lib/Controller/TransactionController.php
index da47ba7..fd950ec 100644
--- a/lib/Controller/TransactionController.php
+++ b/lib/Controller/TransactionController.php
@@ -25,8 +25,8 @@ class TransactionController extends Controller
 	private $transactionMapper;
 	private $userPermissionMapper;
 	private $logger;
-	private $DATE_FORMAT = DateTime::RFC3339_EXTENDED;
 	private const DATE_FORMAT = "Y-m-d\TH:i:s.v\Z";
+    private const AMOUNT_REGEX = "/^(([\d]{1,3}[\,\.]?)?([\d]{3}([\.\,])?)+([\.\,][\d]{2})?|[\d]+)$/";
 
 	public function __construct(
 		$AppName,
@@ -120,7 +120,7 @@ class TransactionController extends Controller
 		$transaction->setDescription($description);
 		$transaction->setAmount($amount);
 		$transaction->setExpense($expense);
-		$dateTime = DateTime::createFromFormat($this->DATE_FORMAT, $date);
+		$dateTime = DateTime::createFromFormat(self::DATE_FORMAT, $date);
 		if (!$dateTime) {
 			return new DataResponse(["message" => "Invalid date format: '$date'"], Http::STATUS_BAD_REQUEST);
 		}
@@ -173,7 +173,7 @@ class TransactionController extends Controller
 		$transaction->setDescription($description);
 		$transaction->setAmount($amount);
 		$transaction->setExpense($expense);
-		$dateTime = DateTime::createFromFormat($this->DATE_FORMAT, $date);
+		$dateTime = DateTime::createFromFormat(self::DATE_FORMAT, $date);
 		if (!$dateTime) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
@@ -240,7 +240,7 @@ class TransactionController extends Controller
 			);
 			$startDateTime->setTime(0, 0, 0, 0);
 		} else {
-			$startDateTime = DateTime::createFromFormat($this->DATE_FORMAT, $startDate);
+			$startDateTime = DateTime::createFromFormat(self::DATE_FORMAT, $startDate);
 		}
 		if (!$startDateTime) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
@@ -255,7 +255,7 @@ class TransactionController extends Controller
 			);
 			$endDateTime->setTime(23, 59, 59, 999);
 		} else {
-			$endDateTime = DateTime::createFromFormat($this->DATE_FORMAT, $endDate);
+			$endDateTime = DateTime::createFromFormat(self::DATE_FORMAT, $endDate);
 		}
 		if (!$endDateTime) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
diff --git a/lib/Migration/Version000001Date20200204101200.php b/lib/Migration/Version000001Date20200204101200.php
index e9d9635..3e83170 100644
--- a/lib/Migration/Version000001Date20200204101200.php
+++ b/lib/Migration/Version000001Date20200204101200.php
@@ -34,7 +34,7 @@ class Version000001Date20200204101200 extends SimpleMigrationStep {
                 'length' => 200
             ]);
             $table->addColumn('description', 'string', [
-                'notnull' => true,
+                'notnull' => false,
                 'length' => 1000,
             ]);
 
diff --git a/src/components/transaction/TransactionForm.vue b/src/components/transaction/TransactionForm.vue
index 0b31bc5..ffe307a 100644
--- a/src/components/transaction/TransactionForm.vue
+++ b/src/components/transaction/TransactionForm.vue
@@ -1,97 +1,97 @@
 <template>
-  <div>
-    <div v-if="!loading" class="add-edit-transaction">
-      <h2>{{ transaction.id ? 'Edit' : 'Add' }} Transaction</h2>
-      <input v-model="transaction.name" type="text" placeholder="Name" title="Name" />
-      <textarea v-model="transaction.description" placeholder="Description" title="Description"></textarea>
-      <input v-model.number="transaction.amount" type="number" placeholder="Amount" title="Amount" />
-      <DatetimePicker :value="transaction.date" type="datetime" />
-      <div class="radio-container">
-        <input v-model="transaction.expense" type="radio" id="expense" :value="true" />
-        <label for="expense">Expense</label>
-        <input v-model="transaction.expense" type="radio" id="income" :value="false" />
-        <label for="income">Income</label>
-      </div>
-      <select v-model="transaction.budgetId" v-on:change="updateCategories()">
-        <option disabled value>Select a budget</option>
-        <option v-for="budget in budgets" :key="budget.id" :value="budget.id">{{ budget.name }}</option>
-      </select>
-      <select v-model="transaction.categoryId">
-        <option disabled value>Select a category</option>
-        <option
-          v-for="category in filteredCategories"
-          :key="category.id"
-          :value="category.id"
-        >{{ category.name }}</option>
-      </select>
-      <button @click="saveTransaction()">Save Transaction</button>
+    <div>
+        <div v-if="!loading" class="add-edit-transaction">
+            <h2>{{ transaction.id ? 'Edit' : 'Add' }} Transaction</h2>
+            <input v-model="transaction.name" type="text" placeholder="Name" title="Name" />
+            <textarea v-model="transaction.description" placeholder="Description" title="Description"></textarea>
+            <input v-model.number="transaction.amount" type="number" placeholder="Amount" title="Amount" />
+            <DatetimePicker :value="transaction.date" type="datetime" />
+            <div class="radio-container">
+                <input v-model="transaction.expense" type="radio" id="expense" :value="true" />
+                <label for="expense">Expense</label>
+                <input v-model="transaction.expense" type="radio" id="income" :value="false" />
+                <label for="income">Income</label>
+            </div>
+            <select v-model="transaction.budgetId" v-on:change="updateCategories()">
+                <option disabled value>Select a budget</option>
+                <option v-for="budget in budgets" :key="budget.id" :value="budget.id">{{ budget.name }}</option>
+            </select>
+            <select v-model="transaction.categoryId">
+                <option disabled value>Select a category</option>
+                <option
+                    v-for="category in filteredCategories"
+                    :key="category.id"
+                    :value="category.id"
+                    >{{ category.name }}</option>
+            </select>
+            <button @click="saveTransaction()">Save Transaction</button>
+        </div>
+        <div v-if="loading" class="icon-loading"></div>
     </div>
-    <div v-if="loading" class="icon-loading"></div>
-  </div>
 </template>
 <script>
 import { DatetimePicker } from "@nextcloud/vue/dist/Components/DatetimePicker";
 import { mapGetters } from "vuex";
 
 export default {
-  name: "add-edit-transaction",
-  components: {
-    DatetimePicker
-  },
-  data: function() {
-    return {
-      saving: false
-    };
-  },
-  props: {
-    transaction: Object
-  },
-  computed: {
-    ...mapGetters(["budgets"]),
-    filteredCategories: function(state) {
-      return this.$store.getters.categories.filter(function(category) {
-        return category.expense === state.transaction.expense;
-      });
+    name: "add-edit-transaction",
+    components: {
+        DatetimePicker
     },
-    loading: state => state.transaction === undefined || state.saving
-  },
-  methods: {
-    updateCategories() {
-      if (!this.transaction) return;
-      this.$store.dispatch(
-        "addEditTransactionBudgetSelected",
-        this.transaction.budgetId
-      );
+    data: function() {
+        return {
+            saving: false
+        };
     },
-    saveTransaction() {
-      this.saving = true;
-      this.$store.dispatch("addEditTransactionSaveClicked", this.transaction);
+    props: {
+        transaction: Object
+    },
+    computed: {
+        ...mapGetters(["budgets"]),
+        filteredCategories: function(state) {
+            return this.$store.getters.categories.filter(function(category) {
+                return category.expense === state.transaction.expense;
+            });
+        },
+        loading: state => state.transaction === undefined || state.saving
+    },
+    methods: {
+        updateCategories() {
+            if (!this.transaction) return;
+            this.$store.dispatch(
+                "addEditTransactionBudgetSelected",
+                this.transaction.budgetId
+            );
+        },
+        saveTransaction() {
+            this.saving = true;
+            this.$store.dispatch("transactionFormSaveClicked", this.transaction);
+        }
+    },
+    mounted() {
+        let transactionId;
+        if (this.transaction) {
+            transactionId = this.transaction.id;
+        }
+        this.updateCategories();
     }
-  },
-  mounted() {
-    let transactionId;
-    if (this.transaction) {
-      transactionId = this.transaction.id;
-    }
-    this.updateCategories();
-  }
 };
 </script>
 <style scoped>
 .add-edit-transaction > * {
-  display: block;
-  width: 100%;
-  max-width: 500px;
+    display: block;
+    width: 100%;
+    max-width: 500px;
 }
 .radio-container {
-  display: flex;
-  align-items: center;
+    display: flex;
+    align-items: center;
 }
 
 .radio-container label {
-  margin-right: 1em;
+    margin-right: 1em;
 }
 .icon-loading {
-  margin-top: 16px;
+    margin-top: 16px;
 }
-</style>
\ No newline at end of file
+</style>