Compare commits
2 Commits
f0e20e4130
...
301f334674
Author | SHA1 | Date | |
---|---|---|---|
301f334674 | |||
fcee3909f4 |
@ -2,8 +2,15 @@
|
|||||||
|
|
||||||
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
|
All notable changes to this project will be documented in this file. Dates are displayed in UTC.
|
||||||
|
|
||||||
#### [v1.0.0](https://git.odit.services/lfk/backend/compare/v0.15.4...v1.0.0)
|
#### [v1.0.1](https://git.odit.services/lfk/backend/compare/v1.0.0...v1.0.1)
|
||||||
|
|
||||||
|
- fix(pagination) page=0 resulted in false thx JS [`fcee390`](https://git.odit.services/lfk/backend/commit/fcee3909f4c4664115cc7ecb94f30e0dd8e78ce0)
|
||||||
|
|
||||||
|
### [v1.0.0](https://git.odit.services/lfk/backend/compare/v0.15.4...v1.0.0)
|
||||||
|
|
||||||
|
> 18 April 2023
|
||||||
|
|
||||||
|
- 🚀Bumped version to v1.0.0 [`f0e20e4`](https://git.odit.services/lfk/backend/commit/f0e20e413014fe446c97754d2765cdad92c2cc3b)
|
||||||
- Merge pull request 'feature/205-pagination' (#206) from feature/205-pagination into dev [`80de188`](https://git.odit.services/lfk/backend/commit/80de188565523d642407612272432ef07672b890)
|
- Merge pull request 'feature/205-pagination' (#206) from feature/205-pagination into dev [`80de188`](https://git.odit.services/lfk/backend/commit/80de188565523d642407612272432ef07672b890)
|
||||||
- Added pagination for runner orgs [`538622a`](https://git.odit.services/lfk/backend/commit/538622aa1841e27256f304e15b4204c2f6d24d76)
|
- Added pagination for runner orgs [`538622a`](https://git.odit.services/lfk/backend/commit/538622aa1841e27256f304e15b4204c2f6d24d76)
|
||||||
- RunnerTeam Pagination [`0fa663a`](https://git.odit.services/lfk/backend/commit/0fa663a34104d438dd8fc9ab02458fdf289329f8)
|
- RunnerTeam Pagination [`0fa663a`](https://git.odit.services/lfk/backend/commit/0fa663a34104d438dd8fc9ab02458fdf289329f8)
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@odit/lfk-backend",
|
"name": "@odit/lfk-backend",
|
||||||
"version": "1.0.0",
|
"version": "1.0.1",
|
||||||
"main": "src/app.ts",
|
"main": "src/app.ts",
|
||||||
"repository": "https://git.odit.services/lfk/backend",
|
"repository": "https://git.odit.services/lfk/backend",
|
||||||
"engines": {
|
"engines": {
|
||||||
|
@ -40,7 +40,7 @@ export class DonationController {
|
|||||||
let responseDonations: ResponseDonation[] = new Array<ResponseDonation>();
|
let responseDonations: ResponseDonation[] = new Array<ResponseDonation>();
|
||||||
let donations: Array<Donation>;
|
let donations: Array<Donation>;
|
||||||
|
|
||||||
if (page) {
|
if (page != undefined) {
|
||||||
donations = await this.donationRepository.find({ relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'], skip: page * page_size, take: page_size });
|
donations = await this.donationRepository.find({ relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'], skip: page * page_size, take: page_size });
|
||||||
} else {
|
} else {
|
||||||
donations = await this.donationRepository.find({ relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'] });
|
donations = await this.donationRepository.find({ relations: ['runner', 'donor', 'runner.scans', 'runner.scans.track'] });
|
||||||
|
@ -29,7 +29,7 @@ export class DonorController {
|
|||||||
let responseDonors: ResponseDonor[] = new Array<ResponseDonor>();
|
let responseDonors: ResponseDonor[] = new Array<ResponseDonor>();
|
||||||
let donors: Array<Donor>;
|
let donors: Array<Donor>;
|
||||||
|
|
||||||
if (page) {
|
if (page != undefined) {
|
||||||
donors = await this.donorRepository.find({ relations: ['donations', 'donations.runner', 'donations.runner.scans', 'donations.runner.scans.track'], skip: page * page_size, take: page_size });
|
donors = await this.donorRepository.find({ relations: ['donations', 'donations.runner', 'donations.runner.scans', 'donations.runner.scans.track'], skip: page * page_size, take: page_size });
|
||||||
} else {
|
} else {
|
||||||
donors = await this.donorRepository.find({ relations: ['donations', 'donations.runner', 'donations.runner.scans', 'donations.runner.scans.track'] });
|
donors = await this.donorRepository.find({ relations: ['donations', 'donations.runner', 'donations.runner.scans', 'donations.runner.scans.track'] });
|
||||||
|
@ -30,7 +30,7 @@ export class GroupContactController {
|
|||||||
let responseContacts: ResponseGroupContact[] = new Array<ResponseGroupContact>();
|
let responseContacts: ResponseGroupContact[] = new Array<ResponseGroupContact>();
|
||||||
let contacts: Array<GroupContact>;
|
let contacts: Array<GroupContact>;
|
||||||
|
|
||||||
if (page) {
|
if (page != undefined) {
|
||||||
contacts = await this.contactRepository.find({ relations: ['groups', 'groups.parentGroup'], skip: page * page_size, take: page_size });
|
contacts = await this.contactRepository.find({ relations: ['groups', 'groups.parentGroup'], skip: page * page_size, take: page_size });
|
||||||
} else {
|
} else {
|
||||||
contacts = await this.contactRepository.find({ relations: ['groups', 'groups.parentGroup'] });
|
contacts = await this.contactRepository.find({ relations: ['groups', 'groups.parentGroup'] });
|
||||||
|
@ -31,7 +31,7 @@ export class PermissionController {
|
|||||||
let responsePermissions: ResponsePermission[] = new Array<ResponsePermission>();
|
let responsePermissions: ResponsePermission[] = new Array<ResponsePermission>();
|
||||||
let permissions: Array<Permission>;
|
let permissions: Array<Permission>;
|
||||||
|
|
||||||
if (page) {
|
if (page != undefined) {
|
||||||
permissions = await this.permissionRepository.find({ relations: ['principal'], skip: page * page_size, take: page_size });
|
permissions = await this.permissionRepository.find({ relations: ['principal'], skip: page * page_size, take: page_size });
|
||||||
} else {
|
} else {
|
||||||
permissions = await this.permissionRepository.find({ relations: ['principal'] });
|
permissions = await this.permissionRepository.find({ relations: ['principal'] });
|
||||||
|
@ -30,7 +30,7 @@ export class RunnerCardController {
|
|||||||
let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>();
|
let responseCards: ResponseRunnerCard[] = new Array<ResponseRunnerCard>();
|
||||||
let cards: Array<RunnerCard>;
|
let cards: Array<RunnerCard>;
|
||||||
|
|
||||||
if (page) {
|
if (page != undefined) {
|
||||||
cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'], skip: page * page_size, take: page_size });
|
cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'], skip: page * page_size, take: page_size });
|
||||||
} else {
|
} else {
|
||||||
cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] });
|
cards = await this.cardRepository.find({ relations: ['runner', 'runner.group', 'runner.group.parentGroup'] });
|
||||||
|
@ -34,7 +34,7 @@ export class RunnerController {
|
|||||||
let responseRunners: ResponseRunner[] = new Array<ResponseRunner>();
|
let responseRunners: ResponseRunner[] = new Array<ResponseRunner>();
|
||||||
let runners: Array<Runner>;
|
let runners: Array<Runner>;
|
||||||
|
|
||||||
if (page) {
|
if (page != undefined) {
|
||||||
runners = await this.runnerRepository.find({ relations: ['scans', 'group', 'group.parentGroup', 'scans.track'], skip: page * page_size, take: page_size });
|
runners = await this.runnerRepository.find({ relations: ['scans', 'group', 'group.parentGroup', 'scans.track'], skip: page * page_size, take: page_size });
|
||||||
} else {
|
} else {
|
||||||
runners = await this.runnerRepository.find({ relations: ['scans', 'group', 'group.parentGroup', 'scans.track'] });
|
runners = await this.runnerRepository.find({ relations: ['scans', 'group', 'group.parentGroup', 'scans.track'] });
|
||||||
|
@ -33,7 +33,7 @@ export class RunnerOrganizationController {
|
|||||||
let responseOrgs: ResponseRunnerOrganization[] = new Array<ResponseRunnerOrganization>();
|
let responseOrgs: ResponseRunnerOrganization[] = new Array<ResponseRunnerOrganization>();
|
||||||
let orgs: Array<RunnerOrganization>;
|
let orgs: Array<RunnerOrganization>;
|
||||||
|
|
||||||
if (page) {
|
if (page != undefined) {
|
||||||
orgs = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'], skip: page * page_size, take: page_size });
|
orgs = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'], skip: page * page_size, take: page_size });
|
||||||
} else {
|
} else {
|
||||||
orgs = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'] });
|
orgs = await this.runnerOrganizationRepository.find({ relations: ['contact', 'teams'] });
|
||||||
|
@ -31,7 +31,7 @@ export class RunnerTeamController {
|
|||||||
let responseTeams: ResponseRunnerTeam[] = new Array<ResponseRunnerTeam>();
|
let responseTeams: ResponseRunnerTeam[] = new Array<ResponseRunnerTeam>();
|
||||||
let teams: Array<RunnerTeam>;
|
let teams: Array<RunnerTeam>;
|
||||||
|
|
||||||
if (page) {
|
if (page != undefined) {
|
||||||
teams = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'], skip: page * page_size, take: page_size });
|
teams = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'], skip: page * page_size, take: page_size });
|
||||||
} else {
|
} else {
|
||||||
teams = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'] });
|
teams = await this.runnerTeamRepository.find({ relations: ['parentGroup', 'contact'] });
|
||||||
|
@ -38,7 +38,7 @@ export class ScanController {
|
|||||||
let responseScans: ResponseScan[] = new Array<ResponseScan>();
|
let responseScans: ResponseScan[] = new Array<ResponseScan>();
|
||||||
let scans: Array<Scan>;
|
let scans: Array<Scan>;
|
||||||
|
|
||||||
if (page) {
|
if (page != undefined) {
|
||||||
scans = await this.scanRepository.find({ relations: ['runner', 'track'], skip: page * page_size, take: page_size });
|
scans = await this.scanRepository.find({ relations: ['runner', 'track'], skip: page * page_size, take: page_size });
|
||||||
} else {
|
} else {
|
||||||
scans = await this.scanRepository.find({ relations: ['runner', 'track'] });
|
scans = await this.scanRepository.find({ relations: ['runner', 'track'] });
|
||||||
|
@ -30,7 +30,7 @@ export class ScanStationController {
|
|||||||
let responseStations: ResponseScanStation[] = new Array<ResponseScanStation>();
|
let responseStations: ResponseScanStation[] = new Array<ResponseScanStation>();
|
||||||
let stations: Array<ScanStation>;
|
let stations: Array<ScanStation>;
|
||||||
|
|
||||||
if (page) {
|
if (page != undefined) {
|
||||||
stations = await this.stationRepository.find({ relations: ['track'], skip: page * page_size, take: page_size });
|
stations = await this.stationRepository.find({ relations: ['track'], skip: page * page_size, take: page_size });
|
||||||
} else {
|
} else {
|
||||||
stations = await this.stationRepository.find({ relations: ['track'] });
|
stations = await this.stationRepository.find({ relations: ['track'] });
|
||||||
|
@ -28,7 +28,7 @@ export class StatsClientController {
|
|||||||
let responseClients: ResponseStatsClient[] = new Array<ResponseStatsClient>();
|
let responseClients: ResponseStatsClient[] = new Array<ResponseStatsClient>();
|
||||||
let clients: Array<StatsClient>;
|
let clients: Array<StatsClient>;
|
||||||
|
|
||||||
if (page) {
|
if (page != undefined) {
|
||||||
clients = await this.clientRepository.find({ skip: page * page_size, take: page_size });
|
clients = await this.clientRepository.find({ skip: page * page_size, take: page_size });
|
||||||
} else {
|
} else {
|
||||||
clients = await this.clientRepository.find();
|
clients = await this.clientRepository.find();
|
||||||
|
@ -29,7 +29,7 @@ export class TrackController {
|
|||||||
let responseTracks: ResponseTrack[] = new Array<ResponseTrack>();
|
let responseTracks: ResponseTrack[] = new Array<ResponseTrack>();
|
||||||
let tracks: Array<Track>;
|
let tracks: Array<Track>;
|
||||||
|
|
||||||
if (page) {
|
if (page != undefined) {
|
||||||
tracks = await this.trackRepository.find({ skip: page * page_size, take: page_size });
|
tracks = await this.trackRepository.find({ skip: page * page_size, take: page_size });
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -32,7 +32,7 @@ export class UserController {
|
|||||||
let responseUsers: ResponseUser[] = new Array<ResponseUser>();
|
let responseUsers: ResponseUser[] = new Array<ResponseUser>();
|
||||||
let users: Array<User>;
|
let users: Array<User>;
|
||||||
|
|
||||||
if (page) {
|
if (page != undefined) {
|
||||||
users = await this.userRepository.find({ relations: ['permissions', 'groups', 'groups.permissions'], skip: page * page_size, take: page_size });
|
users = await this.userRepository.find({ relations: ['permissions', 'groups', 'groups.permissions'], skip: page * page_size, take: page_size });
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -31,7 +31,7 @@ export class UserGroupController {
|
|||||||
let responseGroups: ResponseUserGroup[] = new Array<ResponseUserGroup>();
|
let responseGroups: ResponseUserGroup[] = new Array<ResponseUserGroup>();
|
||||||
let groups: Array<UserGroup>;
|
let groups: Array<UserGroup>;
|
||||||
|
|
||||||
if (page) {
|
if (page != undefined) {
|
||||||
groups = await this.userGroupsRepository.find({ relations: ['permissions'], skip: page * page_size, take: page_size });
|
groups = await this.userGroupsRepository.find({ relations: ['permissions'], skip: page * page_size, take: page_size });
|
||||||
} else {
|
} else {
|
||||||
groups = await this.userGroupsRepository.find({ relations: ['permissions'] });
|
groups = await this.userGroupsRepository.find({ relations: ['permissions'] });
|
||||||
|
Loading…
x
Reference in New Issue
Block a user