Skip to content

Commit 5ec10b9

Browse files
teelurawilner
andauthored
Fixing bug that ignored custom transactions on CSV import (#673) (#674) (#685)
* Fixing bug that ignored custom transactions on CSV import (#673) (#674) Co-authored-by: Tyler Shea <Tylershea12@gmail.com> * run on all PRs --------- Co-authored-by: Alessandro Wilner <awilner@gmail.com>
1 parent 019d99f commit 5ec10b9

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

.github/workflows/codeql.yml

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ name: "CodeQL Advanced"
1313

1414
on:
1515
push:
16-
branches: [ "main" ]
16+
branches: ["main"]
1717
pull_request:
18-
branches: [ "main" ]
1918
schedule:
20-
- cron: '35 15 * * 5'
19+
- cron: "35 15 * * 5"
2120

2221
jobs:
2322
analyze:
@@ -43,12 +42,12 @@ jobs:
4342
fail-fast: false
4443
matrix:
4544
include:
46-
- language: actions
47-
build-mode: none
48-
- language: csharp
49-
build-mode: autobuild
50-
- language: javascript-typescript
51-
build-mode: none
45+
- language: actions
46+
build-mode: none
47+
- language: csharp
48+
build-mode: autobuild
49+
- language: javascript-typescript
50+
build-mode: none
5251
# CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift'
5352
# Use `c-cpp` to analyze code written in C, C++ or both
5453
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
@@ -58,46 +57,46 @@ jobs:
5857
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
5958
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
6059
steps:
61-
- name: Checkout repository
62-
uses: actions/checkout@v4
60+
- name: Checkout repository
61+
uses: actions/checkout@v4
6362

64-
# Add any setup steps before running the `github/codeql-action/init` action.
65-
# This includes steps like installing compilers or runtimes (`actions/setup-node`
66-
# or others). This is typically only required for manual builds.
67-
# - name: Setup runtime (example)
68-
# uses: actions/setup-example@v1
63+
# Add any setup steps before running the `github/codeql-action/init` action.
64+
# This includes steps like installing compilers or runtimes (`actions/setup-node`
65+
# or others). This is typically only required for manual builds.
66+
# - name: Setup runtime (example)
67+
# uses: actions/setup-example@v1
6968

70-
# Initializes the CodeQL tools for scanning.
71-
- name: Initialize CodeQL
72-
uses: github/codeql-action/init@v4
73-
with:
74-
languages: ${{ matrix.language }}
75-
build-mode: ${{ matrix.build-mode }}
76-
# If you wish to specify custom queries, you can do so here or in a config file.
77-
# By default, queries listed here will override any specified in a config file.
78-
# Prefix the list here with "+" to use these queries and those in the config file.
69+
# Initializes the CodeQL tools for scanning.
70+
- name: Initialize CodeQL
71+
uses: github/codeql-action/init@v4
72+
with:
73+
languages: ${{ matrix.language }}
74+
build-mode: ${{ matrix.build-mode }}
75+
# If you wish to specify custom queries, you can do so here or in a config file.
76+
# By default, queries listed here will override any specified in a config file.
77+
# Prefix the list here with "+" to use these queries and those in the config file.
7978

80-
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
81-
# queries: security-extended,security-and-quality
79+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
80+
# queries: security-extended,security-and-quality
8281

83-
# If the analyze step fails for one of the languages you are analyzing with
84-
# "We were unable to automatically build your code", modify the matrix above
85-
# to set the build mode to "manual" for that language. Then modify this step
86-
# to build your code.
87-
# ℹ️ Command-line programs to run using the OS shell.
88-
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
89-
- name: Run manual build steps
90-
if: matrix.build-mode == 'manual'
91-
shell: bash
92-
run: |
93-
echo 'If you are using a "manual" build mode for one or more of the' \
94-
'languages you are analyzing, replace this with the commands to build' \
95-
'your code, for example:'
96-
echo ' make bootstrap'
97-
echo ' make release'
98-
exit 1
82+
# If the analyze step fails for one of the languages you are analyzing with
83+
# "We were unable to automatically build your code", modify the matrix above
84+
# to set the build mode to "manual" for that language. Then modify this step
85+
# to build your code.
86+
# ℹ️ Command-line programs to run using the OS shell.
87+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
88+
- name: Run manual build steps
89+
if: matrix.build-mode == 'manual'
90+
shell: bash
91+
run: |
92+
echo 'If you are using a "manual" build mode for one or more of the' \
93+
'languages you are analyzing, replace this with the commands to build' \
94+
'your code, for example:'
95+
echo ' make bootstrap'
96+
echo ' make release'
97+
exit 1
9998
100-
- name: Perform CodeQL Analysis
101-
uses: github/codeql-action/analyze@v4
102-
with:
103-
category: "/language:${{matrix.language}}"
99+
- name: Perform CodeQL Analysis
100+
uses: github/codeql-action/analyze@v4
101+
with:
102+
category: "/language:${{matrix.language}}"

server/BudgetBoard.Service/TransactionService.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ private async Task<ApplicationUser> GetCurrentUserAsync(string id)
335335
.Include(u => u.Accounts)
336336
.ThenInclude(a => a.Balances)
337337
.Include(u => u.UserSettings)
338+
.Include(u => u.TransactionCategories)
338339
.AsSplitQuery()
339340
.FirstOrDefaultAsync(u => u.Id == new Guid(id));
340341
}

0 commit comments

Comments
 (0)