Merge pull request #174 from WildCodeSchool/feature/bulle-info

Feature/bulle info

Author: YDrogen

packages/backend/api/src/game/creature/post.buy-creature.ts

@@ -5,30 +5,6 @@ import { db } from '@app/backend-shared';
 
 const postBuyCreature = Router();
 
-// check how many creatures we can unlock in this zone
-function getTotalCreaturesByZone(zoneId: number) {
-  return db
-    .selectFrom('creatures')
-    .select([db.fn.count('creatures.id').as('quantityCreature')])
-    .where('creatures.zone_id', '=', zoneId)
-    .executeTakeFirst();
-}
-
-//check how many creatures user has unlocked in this zone
-function getCreaturesUnlockedByZone(zoneId: number, parkId: number) {
-  return db
-    .selectFrom('park_creatures')
-    .leftJoin('creatures', 'park_creatures.creature_id', 'creatures.id')
-    .select([
-      sql<number>`COUNT(DISTINCT ${sql.ref('park_creatures.creature_id')})`.as(
-        'countCreaturesUnlockedByZone',
-      ),
-    ])
-    .where('creatures.zone_id', '=', zoneId)
-    .where('park_creatures.park_id', '=', parkId)
-    .executeTakeFirst();
-}
-
 //Check if we have already the next zone in bdd
 function getIsNextZoneUnlocked(parkId: number, zoneId: number) {
   return db
@@ -161,12 +137,7 @@ postBuyCreature.post('/buy', async (req: Request, res) => {
     })
     .executeTakeFirst();
 
-  const [isNextZoneUnlocked] = await Promise.all([
-    getTotalCreaturesByZone(zoneId),
-    getCreaturesUnlockedByZone(zoneId, parkId),
-    getIsNextZoneUnlocked(parkId, zoneId),
-  ]);
-
+  const isNextZoneUnlocked = await getIsNextZoneUnlocked(parkId, zoneId);
   const zone = await db
     .selectFrom('zones')
     .select(['name'])

packages/backend/api/src/game/get.gift.ts

@@ -202,7 +202,7 @@ getGiftRoute.get('/gift', async (req: Request, res) => {
     //else draw a visitor from the unlocked ones
     const chosen = visitors[Math.floor(Math.random() * visitors.length)];
 
-    await insertGift(parkId, 'visitor', `visitor- ${chosen.category}`);
+    await insertGift(parkId, 'visitor', `visitor-${chosen.category}`);
     await insertVisitorToPark(parkId, chosen);
     await updateWallet(parkId, chosen.entry_price);
 

packages/backend/api/src/game/get.wallet.ts

@@ -29,6 +29,14 @@ getWallet.get('/wallet', async (req: Request, res) => {
     return;
   }
 
+  if (park.wallet === null) {
+    res.json({
+      ok: false,
+      message: 'no wallet for this user',
+    });
+    return;
+  }
+
   res.json({
     ok: true,
     park,

packages/backend/api/src/game/get.zones-count.ts

@@ -18,6 +18,7 @@ function getZones(parkId: number) {
       'zones.src_image',
       'zones.link',
       'park_zones.id as park_zone_id',
+      'zones.required_qty',
     ])
     .execute();
 }

packages/backend/migrations/src/migrations/20250617-add-unlock-zone.ts

@@ -0,0 +1,23 @@
+import { type Kysely, sql } from 'kysely';
+
+import type { DB } from '@app/shared';
+
+export async function up(db: Kysely<DB>): Promise<void> {
+  // Migration code that update the database to the desired state.
+  await db.transaction().execute(async (trx) => {
+    await sql`
+      ALTER TABLE zones
+      ADD COLUMN required_qty INT NOT NULL;
+    `.execute(trx);
+  });
+}
+
+export async function down(db: Kysely<DB>): Promise<void> {
+  // Migration code that reverts the database to the previous state.
+  await db.transaction().execute(async (trx) => {
+    await sql`
+      ALTER TABLE zones
+      DROP COLUMN required_qty;
+    `.execute(trx);
+  });
+}

packages/frontend/web/src/components/barrier.tsx

@@ -19,7 +19,7 @@ type BarrierProps = {
 };
 
 export default function Barrier({ barrier, refetch }: BarrierProps) {
-  const { wallet, walletRefetch } = useGameInfoContext();
+  const { wallet, refetchWallet } = useGameInfoContext();
   const hasEnoughMoons = wallet >= barrier.price;
   const priceFormatted = formatNumber(barrier.price);
 
@@ -41,7 +41,7 @@ export default function Barrier({ barrier, refetch }: BarrierProps) {
 
       if (result.ok === true) {
         await refetch();
-        await walletRefetch();
+        await refetchWallet();
       }
     } catch (error) {
       // eslint-disable-next-line no-console

packages/frontend/web/src/components/buy-creature.tsx

@@ -22,15 +22,18 @@ export default function BuyCreature({
   const [name, setName] = useState('');
   const [nameError, setNameError] = useState('');
   const [isBought, setIsBought] = useState(false);
+
   const {
     wallet,
-    zonesRefetch,
-    creaturesRefetch,
-    visitorsRefetch,
-    parkRefetch,
-    walletRefetch,
+    refetchZones,
+    refetchCreatures,
+    refetchVisitors,
+    refetchPark,
+    refetchWallet,
     creaturesEnclos,
+    refetchCreaturesMenu,
   } = useGameInfoContext();
+
   const { zone_id: zoneId } = useParams();
 
   const creaturesEnclosId = creaturesEnclos.find(
@@ -76,12 +79,13 @@ export default function BuyCreature({
 
       if (result.ok === true) {
         await Promise.all([
-          parkRefetch(),
-          zonesRefetch(),
+          refetchPark(),
+          refetchZones(),
           fetchCreatures(),
-          creaturesRefetch(),
-          visitorsRefetch(),
-          walletRefetch(),
+          refetchCreatures(),
+          refetchVisitors(),
+          refetchWallet(),
+          refetchCreaturesMenu(),
         ]);
 
         setName('');

packages/frontend/web/src/components/create-park.tsx

@@ -12,11 +12,11 @@ export default function CreatePark() {
 
   const { hasParkId, setHasParkId } = useAuth();
   const {
-    parkRefetch,
-    zonesRefetch,
-    creaturesRefetch,
-    visitorsRefetch,
-    decorationsRefetch,
+    refetchPark,
+    refetchZones,
+    refetchCreatures,
+    refetchVisitors,
+    refetchDecorations,
   } = useGameInfoContext();
 
   // if we have a parkid go Home
@@ -44,11 +44,11 @@ export default function CreatePark() {
       setHasParkId(true);
       //Refetch necessary fetch
       await Promise.all([
-        parkRefetch(),
-        zonesRefetch(),
-        creaturesRefetch(),
-        visitorsRefetch(),
-        decorationsRefetch(),
+        refetchPark(),
+        refetchZones(),
+        refetchCreatures(),
+        refetchVisitors(),
+        refetchDecorations(),
       ]);
     }
   };

packages/frontend/web/src/components/creature-line.tsx

@@ -37,7 +37,7 @@ export default function CreatureLine({
   creature,
   potionPrice,
 }: CreatureLineProps) {
-  const { wallet, parkRefetch, walletRefetch } = useGameInfoContext();
+  const { wallet, refetchPark, refetchWallet } = useGameInfoContext();
   const [isClicked, setIsClicked] = useState(false);
   const hasEnoughMoons = wallet >= Number(potionPrice);
 
@@ -58,7 +58,7 @@ export default function CreatureLine({
 
       const result = await response.json();
       if (result.ok === true) {
-        await Promise.all([fetchCreatures(), parkRefetch(), walletRefetch()]);
+        await Promise.all([fetchCreatures(), refetchPark(), refetchWallet()]);
       }
     } catch (error) {
       // eslint-disable-next-line no-console

packages/frontend/web/src/components/dashboard.tsx

@@ -1,7 +1,5 @@
 import { useGameInfoContext } from '@/contexts/game-info-context';
-import useCreaturesMenu from '@/hooks/use-creatures-menu';
 import useVisitors from '@/hooks/use-visitors';
-import useZones from '@/hooks/use-zones';
 import { formatNumber } from '@/utils/number-formatter';
 
 import moon from '../assets/images/icons-buttons/moon.png';
@@ -15,10 +13,14 @@ type DashboardProps = {
 };
 
 export default function Dashboard({ closeDashboard }: DashboardProps) {
-  const { parkName, wallet, countVisitorActiveFormated } = useGameInfoContext();
+  const {
+    parkName,
+    wallet,
+    countVisitorActiveFormated,
+    creaturesMenu,
+    unlockedZones,
+  } = useGameInfoContext();
   const { visitors } = useVisitors();
-  const { unlockedZones } = useZones();
-  const { creaturesMenu } = useCreaturesMenu();
 
   const countCreaturesIdUnlocked = creaturesMenu.reduce((count, element) => {
     return count + (Number(element.quantityCreature) >= 1 ? 1 : 0);