Fix end_turn reaction activable bug

Author: MrPio

src/repository/repository.ts

@@ -29,9 +29,8 @@ export abstract class Repository<T> {
    * @param id - The unique identifier of the item to invalidate in the cache.
    */
   protected async invalidateCache(id: string) {
-    if ((process.env.USE_REDIS ?? 'true') == 'true') {
+    if ((process.env.USE_REDIS ?? 'true') == 'true')
       await redis!.del(`${this.modelName}:${id}`);
-    }
   }
 
   /**
@@ -41,9 +40,9 @@ export abstract class Repository<T> {
    * @returns The item if found in the cache; otherwise, null.
    */
   async getById(id: string, noCache: boolean = false): Promise<T | null> {
-    if ((process.env.USE_REDIS ?? 'true') != 'true' || noCache) {
+    if ((process.env.USE_REDIS ?? 'true') != 'true' || noCache)
       return null;
-    }
+
     // Check if the object is in cache
     const item = await redis!.get(`${this.modelName}:${id}`);
     if (item) {

src/repository/repository_factory.ts

@@ -23,25 +23,25 @@ export class RepositoryFactory {
    * Creates a repository for `Session` entities with Sequelize.
    * @returns A `SequelizeRepository` instance for `Session`.
    */
-  sessionRepository = (): Repository<Session> => new SequelizeRepository(Session, [Monster, HistoryMessage, EntityTurn], 1);
+  sessionRepository = (): Repository<Session> => new SequelizeRepository(Session, [Monster, HistoryMessage, EntityTurn], 30);
 
   /**
    * Creates a repository for `Monster` entities with Sequelize.
    * @returns A `SequelizeRepository` instance for `Monster`.
    */
-  monsterRepository = (): Repository<Monster> => new SequelizeRepository(Monster, [MonsterSkill, Session], 5);
+  monsterRepository = (): Repository<Monster> => new SequelizeRepository(Monster, [MonsterSkill, Session], 30);
 
   /**
    * Creates a repository for `EntityTurn` entities with Sequelize.
    * @returns A `SequelizeRepository` instance for `EntityTurn`.
    */
-  entityTurnRepository = (): Repository<EntityTurn> => new SequelizeRepository(EntityTurn, [Session], 10);
+  entityTurnRepository = (): Repository<EntityTurn> => new SequelizeRepository(EntityTurn, [Session], 30);
 
   /**
    * Creates a repository for `MonsterSkill` entities with Sequelize.
    * @returns A `SequelizeRepository` instance for `MonsterSkill`.
    */
-  monsterSkillRepository = (): Repository<MonsterSkill> => new SequelizeRepository(MonsterSkill, [Monster], 3);
+  monsterSkillRepository = (): Repository<MonsterSkill> => new SequelizeRepository(MonsterSkill, [Monster], 30);
 
   /**
    * Creates a repository for `HistoryMessage` entities with Sequelize.
@@ -59,13 +59,13 @@ export class RepositoryFactory {
    * Creates a repository for `Character` entities with Firestore.
    * @returns A `FirestoreRepository` instance for `Character`.
    */
-  characterRepository = (): Repository<Character> => new FirestoreRepository('characters', Character.fromJSON, 15);
+  characterRepository = (): Repository<Character> => new FirestoreRepository('characters', Character.fromJSON, 60);
 
   /**
    * Creates a repository for `NPC` entities with Firestore.
    * @returns A `FirestoreRepository` instance for `NPC`.
    */
-  npcRepository = (): Repository<NPC> => new FirestoreRepository('npcs', NPC.fromJSON, 15);
+  npcRepository = (): Repository<NPC> => new FirestoreRepository('npcs', NPC.fromJSON, 60);
 
   /**
    * Creates a repository for `Enchantment` entities with Firestore.

src/service/turn_service.ts

@@ -28,14 +28,14 @@ export async function postponeTurnService(req: IAugmentedRequest, res: Response)
 
 export async function endTurnService(req: IAugmentedRequest, res: Response) {
 
+  // Set the reaction of the new playing entity to activatable
+  updateEntity(req.session!, req.session!.sortedTurns[0].entityUID, { isReactionActivable: true });
+
   // Push the current entity to the end of the turns list
   req.session!.sortedTurns[0].turnIndex = req.session!.entityTurns.length;
   for (const turn of req.session!.sortedTurns)
     turn.turnIndex -= 1;
 
-  // Set the reaction of the new playing entity to activatable
-  updateEntity(req.session!, req.session!.sortedTurns[0].entityUID, { isReactionActivable: true });
-
   // Update session in the database
   req.session?.entityTurns.forEach(it => entityTurnRepository.update(it.id, { turnIndex: it.turnIndex }));
   return res.status(200).json({ message: `Turn of entity ${req.entity?._name} has ended successfully!` });