feat(article): add endpoint to retrieve user's items with search filter

feat(law): implement endpoint to fetch all laws with approval status
fix(drawer): uncomment 'Hôtel de ventes' menu item for navigation
fix(store): enhance item count display and improve search functionality

Author: tacxou

apps/api/src/core/article/article.controller.ts

@@ -20,6 +20,26 @@ export class ArticleController {
     })
   }
 
+  @Get('my/:playerName')
+  public async my(
+    @Param('playerName') playerName: string,
+    @Query('recherche') recherche: string,
+    @Req() req: Request & { user: any },
+    @Res() res: Response,
+  ): Promise<Response> {
+    if ((req.user as any).name !== playerName && !(req.user as any).roles.includes('op')) {
+      return res.status(HttpStatus.FORBIDDEN).json({
+        statusCode: HttpStatus.FORBIDDEN,
+        message: 'You are not allowed to sell this item',
+      })
+    }
+
+    return res.status(HttpStatus.OK).json({
+      statusCode: HttpStatus.OK,
+      data: await this._service.findMy(playerName, recherche),
+    })
+  }
+
   @Public()
   @Get('average')
   public async average(

apps/api/src/core/article/article.service.ts

@@ -168,6 +168,81 @@ export class ArticleService {
     )
   }
 
+  public async findMy(playerName: string, filterSearch: string = '') {
+    let filters = {}
+    filters['state'] = ArticleState.ON_SALE
+    if (filterSearch) {
+      filters['name'] = new RegExp(filterSearch, 'i')
+    }
+
+    const playerModel = await this._users.findOne({ name: playerName })
+    if (!playerModel) throw new NotFoundException('Player not found')
+
+    filters['vendor.id'] = playerModel._id
+
+    const items = await this._model.aggregate([
+      { $match: filters },
+      {
+        $match: {
+          state: ArticleState.ON_SALE,
+        },
+      },
+      {
+        $group: {
+          _id: { name: '$name', stack: '$stack', nbt: '$nbt', state: '$state' },
+          price: { $min: '$price' },
+          quantity: { $sum: 1 },
+          onSaleAt: { $max: '$metadata.onSaleAt' },
+        },
+      },
+      {
+        $group: {
+          _id: '$_id.name',
+          items: {
+            $push: {
+              name: '$_id.name',
+              stack: '$_id.stack',
+              nbt: '$_id.nbt',
+              quantity: '$quantity',
+              state: '$state',
+              price: '$price',
+              'onSaleAt': '$onSaleAt'
+            },
+          },
+          // stack: '$stack',
+        },
+      },
+      {
+        $sort: {
+          '_id': 1,
+        },
+      },
+    ])
+
+    return await Promise.all(
+      items.map(async (item) => {
+        let _data = {}
+        const data = await this._redis.get(`oms:items:${item.id}`)
+        try {
+          _data = JSON.parse(data).model
+        } catch (error) {
+        }
+
+        if (existsSync(`../../storage/render/${item._id.replace(':', '__')}.png`)) {
+          const file = readFileSync(`../../storage/render/${item._id.replace(':', '__')}.png`)
+          _data['texture'] = `data:image/png;base64,${file.toString('base64')}`
+        }
+
+        return {
+          ...item,
+          name: item._id.split(':')[1],
+          mod: item._id.split(':')[0],
+          _data,
+        }
+      }),
+    )
+  }
+
   public async sellItem(
     name: string,
     slot: number,

apps/api/src/core/democracy/law/law.controller.ts

@@ -8,6 +8,17 @@ import { HasRoles } from '~/_common/_decorators/has-role.decorator'
 export class LawController {
   public constructor(private readonly _service: LawService) { }
 
+  @Public()
+  @Get('all')
+  public async getAllLaws(
+    @Res() res: Response,
+  ): Promise<Response> {
+    return res.status(HttpStatus.OK).json({
+      statusCode: HttpStatus.OK,
+      data: await this._service.getAllLaws(),
+    })
+  }
+
   @Public()
   @Get(':playerName')
   public async getLaws(

apps/api/src/core/democracy/law/law.service.ts

@@ -11,8 +11,38 @@ export class LawService {
     this._model = _model
   }
 
+  public async getAllLaws(): Promise<Law[]> {
+    const currentDate = new Date()
+
+    const laws = await this._model.find({
+      appliedAt: {
+        $lte: currentDate,
+      },
+    }, {
+      // votes: 0,
+    }).exec()
+
+    return (laws || []).map((law) => {
+      let approuved = 0
+      for (const vote of law.votes) {
+        approuved += vote.type
+      }
+
+      return {
+        ...omit(law.toObject(), ['votes']),
+        approuved: approuved > 0,
+      }
+    })
+  }
+
   public async getLaws(playerName: string = ''): Promise<Law[]> {
-    const laws = await this._model.find({}, {
+    const currentDate = new Date()
+
+    const laws = await this._model.find({
+      appliedAt: {
+        $gt: currentDate,
+      },
+    }, {
       // votes: 0,
     }).exec()
 

apps/web/src/components/layout/default/drawer.vue

@@ -31,12 +31,10 @@ export default {
         { name: 'Accueil', to: '/', icon: 'mdi-view-dashboard' },
         { name: 'Banque', to: '/bank', icon: 'mdi-bank' },
         { name: 'Démocratie', to: '/democracy', icon: 'mdi-vote-outline' },
-        // { name: 'Hôtel de ventes', to: '/store?mod=minecraft&recherche=', icon: 'mdi-store' },
+        { name: 'Hôtel de ventes', to: '/store?mod=minecraft&recherche=', icon: 'mdi-store' },
         { name: 'Défis de la semaine', to: '/defi/upload', icon: 'mdi-bullseye-arrow' },
       ],
-      bottom: [
-        /* { name: 'Inventaire', to: '/inventory', icon: 'mdi-archive' } */
-      ],
+      bottom: [{ name: 'Inventaire', to: '/inventory', icon: 'mdi-archive' }],
     }
   },
   setup() {

apps/web/src/pages/store.vue

@@ -2,18 +2,22 @@
   q-card.flex.full-width(flat :style="{ flex: 1 }")
     q-card-section(style='position: relative;bottom: 0;top: 0;max-height: 100%; min-width: 288px;')
       q-tabs(v-model="mod" outside-arrows vertical style='max-height: 100%;position: absolute;top:0;bottom: 0;')
+        q-tab(name="my")
+            //- q-avatar.q-mr-sm(square color="secondary" text-color="white" size='25px') MY
+            q-item-label Vos items
         q-tab(v-for='mod in mods' :key="mod.name" :name="mod.name")
           div.flex.row.items-center
             q-avatar.q-mr-sm(square color="secondary" text-color="white" size='25px') {{ getModIcon(mod.name) }}
             q-item-label {{ mod.name }}
-            q-badge.q-ml-xs(color='info') {{ mod.count }}
+            q-badge.q-ml-xs(color='red') {{ mod.count }}
 
     q-card-section(:style="{ flex: 1 }")
       q-table(
         flat bordered
         title="Articles"
         :rows="search"
         :columns="searchColumns"
+        @keyup.enter="enterSearch"
         row-key="name"
       )
         template(#top="props")
@@ -24,9 +28,18 @@
               v-model="recherche"
               debounce="300"
               placeholder="Search"
+              clearable
+              @keyup.enter="enterSearch"
               class="q-ml-sm"
               :style="{ width: '300px' }"
             )
+            q-btn(
+              @click="enterSearch"
+              color="red"
+              round
+              dense
+              icon="mdi-magnify"
+            )
         template(#header="props")
           q-tr(:props="props")
             q-th(auto-width)
@@ -75,30 +88,32 @@ export default {
       get: () => {
         return `${useRoute().query.mod || 'all'}`
       },
-      set: (value) => {
+      set: async (value) => {
         const $route = useRoute()
         const $router = useRouter()
-        $router.replace({
+        await $router.replace({
           query: {
             ...$route.query,
             mod: `${value}`,
           },
         })
+        window.location.href = $route.fullPath
       },
     })
     const recherche = computed({
       get: () => {
         return `${useRoute().query.recherche || ''}`
       },
-      set: (value) => {
+      set: async (value) => {
         const $route = useRoute()
         const $router = useRouter()
-        $router.replace({
+        await $router.replace({
           query: {
             ...$route.query,
-            recherche: `${value}`,
+            recherche: `${value || ''}`,
           },
         })
+        // window.location.href = $route.fullPath
       },
     })
 
@@ -118,11 +133,18 @@ export default {
       },
     })
 
+    const path = ref('/core/article/search')
+    if (mod.value === 'my') {
+      path.value = `/core/article/my/${getUsername.value}`
+    } else {
+      path.value = '/core/article/search'
+    }
+
     const {
       data: search,
       refresh: refreshSearch,
       error: errorSearch,
-    } = await useHttp<any>('/core/article/search', {
+    } = await useHttp<any>(path, {
       query: { mod, recherche: recherche.value },
       transform: (result) => {
         return result?.data || []
@@ -167,6 +189,11 @@ export default {
     },
   },
   methods: {
+    enterSearch() {
+      const $route = useRoute()
+      this.refreshSearch()
+      window.location.href = $route.fullPath
+    },
     getAveragePrice(item) {
       const average = this.average.find((average) => average._id === item.name)
       if (average) {