1 Commits

Author SHA1 Message Date
c2f9ef8ec7 Fix linter errors
Some checks failed
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is failing
2022-08-21 19:49:16 +00:00
10 changed files with 23 additions and 42 deletions

View File

@@ -29,15 +29,13 @@ linters-settings:
wrapcheck: wrapcheck:
ignoreSigs: ignoreSigs:
- .JSON( - .JSON(
- .Redirect(
- .String(
- .Errorf( - .Errorf(
- errors.New( - errors.New(
- errors.Unwrap( - errors.Unwrap(
- .Wrap( - .Wrap(
- .Wrapf( - .Wrapf(
- .WithMessage( - .WithMessage(
- .WithMessagef( - .WithMessagef(
- .WithStack( - .WithStack(
ignorePackageGlobs: ignorePackageGlobs:
- git.javil.eu/jacob1123/budgeteer/postgres - git.javil.eu/jacob1123/budgeteer/postgres

View File

@@ -1,12 +0,0 @@
(def go
(from (linux/alpine)
($ apk add go)))
(-> ($ go mod download)
(with-image go)
(with-mount *dir*/go.mod ./go.mod)
(with-mount *dir*/go.sum ./go.sum))
(def go-mods
(from go
($ go mod download)))

View File

@@ -40,7 +40,6 @@ func TestRegisterUser(t *testing.T) {
http.MethodPost, http.MethodPost,
"/api/v1/user/register", "/api/v1/user/register",
strings.NewReader(`{"password":"pass","email":"info@example.com","name":"Test"}`)) strings.NewReader(`{"password":"pass","email":"info@example.com","name":"Test"}`))
request.Header.Set("Content-Type", "application/json")
context := engine.NewContext(request, recorder) context := engine.NewContext(request, recorder)
if err != nil { if err != nil {
t.Errorf("error creating request: %s", err) t.Errorf("error creating request: %s", err)

View File

@@ -63,7 +63,7 @@ func (h *Handler) loginPost(c echo.Context) error {
var login loginInformation var login loginInformation
err := c.Bind(&login) err := c.Bind(&login)
if err != nil { if err != nil {
return fmt.Errorf("parse payload: %w", err) return err
} }
user, err := h.Service.GetUserByUsername(c.Request().Context(), login.User) user, err := h.Service.GetUserByUsername(c.Request().Context(), login.User)
@@ -72,12 +72,12 @@ func (h *Handler) loginPost(c echo.Context) error {
} }
if err = h.CredentialsVerifier.Verify(login.Password, user.Password); err != nil { if err = h.CredentialsVerifier.Verify(login.Password, user.Password); err != nil {
return fmt.Errorf("verify password: %w", err) return err
} }
token, err := h.TokenVerifier.CreateToken(&user) token, err := h.TokenVerifier.CreateToken(&user)
if err != nil { if err != nil {
return fmt.Errorf("create token: %w", err) return err
} }
go h.UpdateLastLogin(user.ID) go h.UpdateLastLogin(user.ID)
@@ -120,7 +120,7 @@ func (h *Handler) registerPost(c echo.Context) error {
hash, err := h.CredentialsVerifier.Hash(register.Password) hash, err := h.CredentialsVerifier.Hash(register.Password)
if err != nil { if err != nil {
return fmt.Errorf("hash password: %w", err) return err
} }
createUser := postgres.CreateUserParams{ createUser := postgres.CreateUserParams{
@@ -135,7 +135,7 @@ func (h *Handler) registerPost(c echo.Context) error {
token, err := h.TokenVerifier.CreateToken(&user) token, err := h.TokenVerifier.CreateToken(&user)
if err != nil { if err != nil {
return fmt.Errorf("create token: %w", err) return err
} }
go h.UpdateLastLogin(user.ID) go h.UpdateLastLogin(user.ID)

View File

@@ -1,7 +1,6 @@
package server package server
import ( import (
"fmt"
"net/http" "net/http"
"git.javil.eu/jacob1123/budgeteer/postgres" "git.javil.eu/jacob1123/budgeteer/postgres"
@@ -27,12 +26,12 @@ func (h *Handler) importYNAB(c echo.Context) error {
transactionsFile, err := c.FormFile("transactions") transactionsFile, err := c.FormFile("transactions")
if err != nil { if err != nil {
return fmt.Errorf("get transactions: %w", err) return err
} }
transactions, err := transactionsFile.Open() transactions, err := transactionsFile.Open()
if err != nil { if err != nil {
return fmt.Errorf("open transactions: %w", err) return err
} }
err = ynab.ImportTransactions(c.Request().Context(), transactions) err = ynab.ImportTransactions(c.Request().Context(), transactions)
@@ -42,12 +41,12 @@ func (h *Handler) importYNAB(c echo.Context) error {
assignmentsFile, err := c.FormFile("assignments") assignmentsFile, err := c.FormFile("assignments")
if err != nil { if err != nil {
return fmt.Errorf("get assignments: %w", err) return err
} }
assignments, err := assignmentsFile.Open() assignments, err := assignmentsFile.Open()
if err != nil { if err != nil {
return fmt.Errorf("open assignments: %w", err) return err
} }
err = ynab.ImportAssignments(c.Request().Context(), assignments) err = ynab.ImportAssignments(c.Request().Context(), assignments)

View File

@@ -11,10 +11,10 @@ export interface Suggestion {
} }
const props = defineProps<{ const props = defineProps<{
text: string | null, text: string,
id: string | null, id: string | undefined,
model: string, model: string,
type?: string | null, type?: string | undefined,
}>(); }>();
const SearchQuery = ref(props.text || ""); const SearchQuery = ref(props.text || "");

View File

@@ -16,9 +16,9 @@ const TX = ref<Transaction>({
Memo: "", Memo: "",
Amount: 0, Amount: 0,
Payee: "", Payee: "",
PayeeID: null, PayeeID: undefined,
Category: "", Category: "",
CategoryID: null, CategoryID: undefined,
CategoryGroup: "", CategoryGroup: "",
GroupID: "", GroupID: "",
ID: "", ID: "",

View File

@@ -42,7 +42,7 @@ const filters = ref({
ToDate: new Date(2999,11,32), ToDate: new Date(2999,11,32),
}); });
watch(() => (filters.value.AccountID ?? "") watch(() => filters.value.AccountID
+ filters.value.PayeeID + filters.value.PayeeID
+ filters.value.CategoryID + filters.value.CategoryID
+ filters.value.FromDate?.toISOString() + filters.value.FromDate?.toISOString()

View File

@@ -2,7 +2,7 @@ import { defineStore } from "pinia";
import { GET, POST } from "../api"; import { GET, POST } from "../api";
import { useBudgetsStore } from "./budget"; import { useBudgetsStore } from "./budget";
import { useSessionStore } from "./session"; import { useSessionStore } from "./session";
import { Transaction, useTransactionsStore } from "./transactions"; import { useTransactionsStore } from "./transactions";
interface State { interface State {
Accounts: Map<string, Account>; Accounts: Map<string, Account>;
@@ -200,7 +200,6 @@ export const useAccountStore = defineStore("budget/account", {
transactionsStore.AddTransactions( transactionsStore.AddTransactions(
response.Transactions response.Transactions
); );
account.Transactions = response.Transactions.map((x : Transaction) =>x.ID);
}, },
async FetchMonthBudget(budgetid: string, year: number, month: number) { async FetchMonthBudget(budgetid: string, year: number, month: number) {
const result = await GET( const result = await GET(

View File

@@ -17,12 +17,12 @@ export interface Transaction {
TransferAccount: string; TransferAccount: string;
CategoryGroup: string; CategoryGroup: string;
Category: string; Category: string;
CategoryID: string | null; CategoryID: string | undefined;
Memo: string; Memo: string;
Status: string; Status: string;
GroupID: string; GroupID: string;
Payee: string; Payee: string;
PayeeID: string | null; PayeeID: string | undefined;
Amount: number; Amount: number;
Reconciled: boolean; Reconciled: boolean;
Account: string; Account: string;
@@ -47,12 +47,10 @@ export const useTransactionsStore = defineStore("budget/transactions", {
} }
return reconciledBalance; return reconciledBalance;
}, },
TransactionsByDate(state) : Record<string, Transaction[]>|undefined{ TransactionsByDate(state) : Record<string, Transaction[]> {
const accountsStore = useAccountStore(); const accountsStore = useAccountStore();
const account = accountsStore.CurrentAccount; const accountID = accountsStore.CurrentAccountID;
if(account === undefined) const allTransactions = [...this.Transactions.values()].filter(x => x.AccountID == accountID);
return undefined;
const allTransactions = account!.Transactions.map(x => this.Transactions.get(x) ?? {} as Transaction);
return groupBy(allTransactions, x => formatDate(x.Date)); return groupBy(allTransactions, x => formatDate(x.Date));
}, },
TransactionsList(state) : Transaction[] { TransactionsList(state) : Transaction[] {