Skip to content

Commit

Permalink
change GET order to newest first
Browse files Browse the repository at this point in the history
  • Loading branch information
david-loe committed Aug 19, 2024
1 parent d29c40c commit 603a30d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions backend/controller/expenseReportController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const fileHandler = multer({ limits: { fileSize: 16000000 } })
export class ExpenseReportController extends Controller {
@Get()
public async getExpenseReport(@Queries() query: GetterQuery<IExpenseReport>, @Request() request: ExRequest) {
const sortFn = (a: IExpenseReport, b: IExpenseReport) => (a.createdAt as Date).valueOf() - (b.createdAt as Date).valueOf()
const sortFn = (a: IExpenseReport, b: IExpenseReport) => (b.createdAt as Date).valueOf() - (a.createdAt as Date).valueOf()
return await this.getter(ExpenseReport, {
query,
filter: { owner: request.user!._id, historic: false },
Expand Down Expand Up @@ -169,7 +169,7 @@ export class ExpenseReportController extends Controller {
export class ExpenseReportExamineController extends Controller {
@Get()
public async getExpenseReport(@Queries() query: GetterQuery<IExpenseReport>) {
const sortFn = (a: IExpenseReport, b: IExpenseReport) => (a.updatedAt as Date).valueOf() - (b.updatedAt as Date).valueOf()
const sortFn = (a: IExpenseReport, b: IExpenseReport) => (b.updatedAt as Date).valueOf() - (a.updatedAt as Date).valueOf()
return await this.getter(ExpenseReport, {
query,
filter: { $and: [{ historic: false }, { $or: [{ state: 'underExamination' }, { state: 'refunded' }] }] },
Expand Down
6 changes: 3 additions & 3 deletions backend/controller/healthCareCostController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const fileHandler = multer({ limits: { fileSize: 16000000 } })
export class HealthCareCostController extends Controller {
@Get()
public async getHealthCareCost(@Queries() query: GetterQuery<IHealthCareCost>, @Request() request: ExRequest) {
const sortFn = (a: IHealthCareCost, b: IHealthCareCost) => (a.createdAt as Date).valueOf() - (b.createdAt as Date).valueOf()
const sortFn = (a: IHealthCareCost, b: IHealthCareCost) => (b.createdAt as Date).valueOf() - (a.createdAt as Date).valueOf()
return await this.getter(HealthCareCost, {
query,
filter: { owner: request.user!._id, historic: false },
Expand Down Expand Up @@ -176,7 +176,7 @@ export class HealthCareCostController extends Controller {
export class HealthCareCostExamineController extends Controller {
@Get()
public async getHealthCareCost(@Queries() query: GetterQuery<IHealthCareCost>) {
const sortFn = (a: IHealthCareCost, b: IHealthCareCost) => (a.updatedAt as Date).valueOf() - (b.updatedAt as Date).valueOf()
const sortFn = (a: IHealthCareCost, b: IHealthCareCost) => (b.updatedAt as Date).valueOf() - (a.updatedAt as Date).valueOf()
return await this.getter(HealthCareCost, {
query,
filter: { $and: [{ historic: false }, { $or: [{ state: 'underExamination' }, { state: 'underExaminationByInsurance' }] }] },
Expand Down Expand Up @@ -327,7 +327,7 @@ export class HealthCareCostExamineController extends Controller {
export class HealthCareCostConfirmController extends Controller {
@Get()
public async getHealthCareCost(@Queries() query: GetterQuery<IHealthCareCost>) {
const sortFn = (a: IHealthCareCost, b: IHealthCareCost) => (a.updatedAt as Date).valueOf() - (b.updatedAt as Date).valueOf()
const sortFn = (a: IHealthCareCost, b: IHealthCareCost) => (b.updatedAt as Date).valueOf() - (a.updatedAt as Date).valueOf()
return await this.getter(HealthCareCost, {
query,
filter: { $and: [{ historic: false }, { $or: [{ state: 'underExaminationByInsurance' }, { state: 'refunded' }] }] },
Expand Down
20 changes: 10 additions & 10 deletions backend/controller/travelController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const fileHandler = multer({ limits: { fileSize: 16000000 } })
export class TravelController extends Controller {
@Get()
public async getTravel(@Queries() query: GetterQuery<ITravel>, @Request() request: ExRequest) {
const sortFn = (a: ITravel, b: ITravel) => (a.startDate as Date).valueOf() - (b.startDate as Date).valueOf()
const sortFn = (a: ITravel, b: ITravel) => (b.startDate as Date).valueOf() - (a.startDate as Date).valueOf()
return await this.getter(Travel, {
query,
filter: { owner: request.user!._id, historic: false },
Expand Down Expand Up @@ -249,7 +249,7 @@ export class TravelController extends Controller {
export class TravelApproveController extends Controller {
@Get()
public async getTravel(@Queries() query: GetterQuery<ITravel>) {
const sortFn = (a: ITravel, b: ITravel) => (a.updatedAt as Date).valueOf() - (b.updatedAt as Date).valueOf()
const sortFn = (a: ITravel, b: ITravel) => (b.updatedAt as Date).valueOf() - (a.updatedAt as Date).valueOf()
return await this.getter(Travel, {
query,
filter: { $and: [{ historic: false }, { $or: [{ state: 'appliedFor' }, { state: 'approved' }] }] },
Expand All @@ -265,15 +265,15 @@ export class TravelApproveController extends Controller {
) {
const extendedBody = Object.assign(requestBody, { state: 'approved' as TravelState, editor: request.user?._id })
if (!extendedBody._id) {
; (extendedBody as any).lastPlaceOfWork = { country: (extendedBody as TravelApplication).destinationPlace?.country, place: '' }
;(extendedBody as any).lastPlaceOfWork = { country: (extendedBody as TravelApplication).destinationPlace?.country, place: '' }
if (!(extendedBody as TravelApplication).name && (extendedBody as TravelApplication).startDate) {
var date = new Date((extendedBody as TravelApplication).startDate!)
; (extendedBody as TravelApplication).name =
(extendedBody as TravelApplication).destinationPlace?.place +
' ' +
i18n.t('monthsShort.' + date.getUTCMonth(), { lng: request.user!.settings.language }) +
' ' +
date.getUTCFullYear()
;(extendedBody as TravelApplication).name =
(extendedBody as TravelApplication).destinationPlace?.place +
' ' +
i18n.t('monthsShort.' + date.getUTCMonth(), { lng: request.user!.settings.language }) +
' ' +
date.getUTCFullYear()
}
}
const cb = async (travel: ITravel) => {
Expand Down Expand Up @@ -322,7 +322,7 @@ export class TravelApproveController extends Controller {
export class TravelExamineController extends Controller {
@Get()
public async getTravel(@Queries() query: GetterQuery<ITravel>) {
const sortFn = (a: ITravel, b: ITravel) => (a.updatedAt as Date).valueOf() - (b.updatedAt as Date).valueOf()
const sortFn = (a: ITravel, b: ITravel) => (b.updatedAt as Date).valueOf() - (a.updatedAt as Date).valueOf()
return await this.getter(Travel, {
query,
filter: { $and: [{ historic: false }, { $or: [{ state: 'underExamination' }, { state: 'refunded' }] }] },
Expand Down

0 comments on commit 603a30d

Please sign in to comment.