fix: filter query (sponsors, jobs)

Author: jiyuujin

apps/web/app/server/api/jobs.get.ts

@@ -14,14 +14,25 @@ export default defineEventHandler(async (event) => {
     type: 'job',
     title: 'job',
     list: jobs
-      .filter((j: Job) => {
-        if (process.env.NODE_ENV === 'production') return j.is_open === true
-        return j
+      .filter(job => {
+        if (process.env.NODE_ENV === 'production') return job.is_open === true
+        return job
       })
       .sort((a: Job, b: Job) => {
         if (b.display_order && a.display_order) return a.display_order - b.display_order
-        return a.created_at < b.created_at ? -1 : 1
-      }),
+        return 1
+      })
+      .concat(
+        jobs
+          .filter((job: Job) => {
+            if (process.env.NODE_ENV === 'production') return job.is_open === true
+            return job
+          })
+          .filter(s => s.display_order === null)
+          .sort((a: Job, b: Job) => {
+            return a.created_at < b.created_at ? -1 : 1
+          }),
+      ),
   }
 
   return { allJobs }

apps/web/app/server/api/sponsors.get.ts

@@ -29,7 +29,6 @@ export default defineEventHandler(async (event) => {
         return s['tag'].includes('platinum')
       })
       .sort((a: Sponsor, b: Sponsor) => {
-        if (b.display_order && a.display_order) return a.display_order - b.display_order
         return a.created_at < b.created_at ? -1 : 1
       }),
   }
@@ -43,7 +42,6 @@ export default defineEventHandler(async (event) => {
         return s['tag'].includes('gold')
       })
       .sort((a: Sponsor, b: Sponsor) => {
-        if (b.display_order && a.display_order) return a.display_order - b.display_order
         return a.created_at < b.created_at ? -1 : 1
       }),
   }
@@ -57,7 +55,6 @@ export default defineEventHandler(async (event) => {
         return s['tag'].includes('silver')
       })
       .sort((a: Sponsor, b: Sponsor) => {
-        if (b.display_order && a.display_order) return a.display_order - b.display_order
         return a.created_at < b.created_at ? -1 : 1
       }),
   }
@@ -71,7 +68,6 @@ export default defineEventHandler(async (event) => {
         return s['tag'].includes('bronze')
       })
       .sort((a: Sponsor, b: Sponsor) => {
-        if (b.display_order && a.display_order) return a.display_order - b.display_order
         return a.created_at < b.created_at ? -1 : 1
       }),
   }
@@ -85,7 +81,6 @@ export default defineEventHandler(async (event) => {
         return s['tag'].includes('special-naming-rights')
       })
       .sort((a: Sponsor, b: Sponsor) => {
-        if (b.display_order && a.display_order) return a.display_order - b.display_order
         return a.created_at < b.created_at ? -1 : 1
       }),
   }
@@ -99,7 +94,6 @@ export default defineEventHandler(async (event) => {
         return s['tag'].includes('naming-rights')
       })
       .sort((a: Sponsor, b: Sponsor) => {
-        if (b.display_order && a.display_order) return a.display_order - b.display_order
         return a.created_at < b.created_at ? -1 : 1
       }),
   }
@@ -113,7 +107,6 @@ export default defineEventHandler(async (event) => {
         return s['tag'].includes('special-lunch')
       })
       .sort((a: Sponsor, b: Sponsor) => {
-        if (b.display_order && a.display_order) return a.display_order - b.display_order
         return a.created_at < b.created_at ? -1 : 1
       }),
   }
@@ -127,7 +120,6 @@ export default defineEventHandler(async (event) => {
         return s['tag'].includes('lunch')
       })
       .sort((a: Sponsor, b: Sponsor) => {
-        if (b.display_order && a.display_order) return a.display_order - b.display_order
         return a.created_at < b.created_at ? -1 : 1
       }),
   }
@@ -141,7 +133,6 @@ export default defineEventHandler(async (event) => {
         return s['tag'].includes('after-party')
       })
       .sort((a: Sponsor, b: Sponsor) => {
-        if (b.display_order && a.display_order) return a.display_order - b.display_order
         return a.created_at < b.created_at ? -1 : 1
       }),
   }
@@ -155,7 +146,6 @@ export default defineEventHandler(async (event) => {
         return s['tag'].includes('name-card')
       })
       .sort((a: Sponsor, b: Sponsor) => {
-        if (b.display_order && a.display_order) return a.display_order - b.display_order
         return a.created_at < b.created_at ? -1 : 1
       }),
   }
@@ -169,7 +159,6 @@ export default defineEventHandler(async (event) => {
         return s['tag'].includes('simultaneous-interpretation')
       })
       .sort((a: Sponsor, b: Sponsor) => {
-        if (b.display_order && a.display_order) return a.display_order - b.display_order
         return a.created_at < b.created_at ? -1 : 1
       }),
   }
@@ -183,7 +172,6 @@ export default defineEventHandler(async (event) => {
         return s['tag'].includes('childcare')
       })
       .sort((a: Sponsor, b: Sponsor) => {
-        if (b.display_order && a.display_order) return a.display_order - b.display_order
         return a.created_at < b.created_at ? -1 : 1
       }),
   }
@@ -197,7 +185,6 @@ export default defineEventHandler(async (event) => {
         return s['tag'].includes('handson')
       })
       .sort((a: Sponsor, b: Sponsor) => {
-        if (b.display_order && a.display_order) return a.display_order - b.display_order
         return a.created_at < b.created_at ? -1 : 1
       }),
   }
@@ -211,7 +198,6 @@ export default defineEventHandler(async (event) => {
         return s['tag'].includes('media')
       })
       .sort((a: Sponsor, b: Sponsor) => {
-        if (b.display_order && a.display_order) return a.display_order - b.display_order
         return a.created_at < b.created_at ? -1 : 1
       }),
   }
@@ -225,7 +211,6 @@ export default defineEventHandler(async (event) => {
         return s['tag'].includes('tool')
       })
       .sort((a: Sponsor, b: Sponsor) => {
-        if (b.display_order && a.display_order) return a.display_order - b.display_order
         return a.created_at < b.created_at ? -1 : 1
       }),
   }