Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature exclude soft deleted organisations from queries #1338

Open
wants to merge 28 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
aa6c7b3
chore: ignore data/db directory
esther-ajayib Feb 28, 2025
49c518b
fix: exclude soft-deleted organizations from queries
esther-ajayib Feb 28, 2025
14613ea
fix: exclude soft-deleted organizations from queries
esther-ajayib Mar 1, 2025
7f45365
Merge branch 'dev' into feature-exclude-deleted-organisations
dainty92 Mar 1, 2025
79d339e
fix: fixed dependencies issue
esther-ajayib Mar 1, 2025
ae26a21
Merge branch 'dev' into feature-exclude-deleted-organisations
dainty92 Mar 1, 2025
4f46ea1
fix: fixed dependencies issue
esther-ajayib Mar 1, 2025
8a00a37
fix: dependency issue
esther-ajayib Mar 1, 2025
3d341fe
Delete package-lock.json
dainty92 Mar 1, 2025
a78fcc6
Merge branch 'dev' into feature-exclude-deleted-organisations
dainty92 Mar 1, 2025
64735f6
Merge branch 'dev' into feature-exclude-deleted-organisations
dainty92 Mar 1, 2025
009a3c2
fix: fixed dependency
esther-ajayib Mar 2, 2025
c486ce3
Merge branch 'dev' into feature-exclude-deleted-organisations
dainty92 Mar 2, 2025
eec8dcf
Revert "fix: dependency issue"
dainty92 Mar 2, 2025
f89542b
fix:Update package.json
dainty92 Mar 2, 2025
2bb5e17
fix: Delete package.json
dainty92 Mar 2, 2025
42472fb
fix: Updated package.json from dev branch
dainty92 Mar 2, 2025
731aaef
fix: dependency conflict
dainty92 Mar 2, 2025
c7143d8
fix: build issue
dainty92 Mar 2, 2025
db6c15f
fix: organisations.service.spec.ts
dainty92 Mar 2, 2025
14b6632
fix: organisations.service.spec.ts
dainty92 Mar 2, 2025
26be27f
fix: organisations.service.spec.ts
dainty92 Mar 3, 2025
0d72bfc
fix: organisations.service.spec
dainty92 Mar 3, 2025
1294c11
fix: organisations.service.spec
dainty92 Mar 3, 2025
291ccd2
fix: test issue
dainty92 Mar 3, 2025
91b038a
fix: organisation test
dainty92 Mar 3, 2025
ae08b28
fix: organisation test
dainty92 Mar 3, 2025
2538a23
fix: organisation test
dainty92 Mar 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -411,11 +411,6 @@ todo.txt
/.vscode/
.vscode/

# Docker compose
docker-compose.yml
data/

# Docker compose
docker-compose.yml
data/

Expand All @@ -431,3 +426,4 @@ docker-compose.yml
data/
.dev.env

package-lock.json
19 changes: 1 addition & 18 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,6 @@
{
"workbench.colorCustomizations": {
"activityBar.background": "#333d2a",
"activityBar.activeBackground": "#333d2a",
"activityBar.activeBorder": "#5b6e84",
"activityBar.foreground": "#e7e7e7",
"activityBar.inactiveForeground": "#e7e7e799",
"activityBarBadge.background": "#5b6e84",
"activityBarBadge.foreground": "#e7e7e7",
"statusBar.background": "#1a1f15",
"statusBarItem.hoverBackground": "#333d2a",
"statusBar.foreground": "#e7e7e7",
"commandCenter.border": "#e7e7e799",
"sash.hoverBorder": "#333d2a",
"statusBarItem.remoteBackground": "#1a1f15",
"statusBarItem.remoteForeground": "#e7e7e7",
"titleBar.activeBackground": "#1a1f15",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#1a1f1599",
"titleBar.inactiveForeground": "#e7e7e799"
"activityBar.activeBorder": "#5b6e84"
},
"peacock.color": "#1a1f15",
"eslint.validate": [
Expand Down
36 changes: 36 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
services:
postgres:
container_name: postgres-boiler
image: postgres:latest
ports:
- '5432:5432'
environment:
- POSTGRES_USER=${DB_USERNAME}
- POSTGRES_PASSWORD=${DB_PASSWORD}
- POSTGRES_DB=${DB_DATABASE}
volumes:
- ./data/db:/var/lib/postgresql/data
restart: always

adminer:
image: adminer
container_name: adminer-boiler
ports:
- '8080:8080'
restart: always
depends_on:
- postgres

redis:
image: redis:latest
container_name: redis-boiler
ports:
- '6379:6379'
command: ['redis-server', '--appendonly', 'yes']
volumes:
- redis_data:/data
restart: always

volumes:
data:
redis_data:
Loading