last access changes

updated changes as smile suggested, created a new canStaff section in the member controller, I also added this section from the controller to the check for which info can be pulled in member service, also changed the watch to watch on the username.
CybertownRevival · Aug 25, 2024 · b6ff2fe · b6ff2fe
1 parent 570c99f
commit b6ff2fe
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/api/src/controllers/member.controller.ts b/api/src/controllers/member.controller.ts
@@ -63,6 +63,8 @@ class MemberController {
       if (typeof request.params.id !== 'undefined') {
         if (await this.memberService.canAdmin(session.id)) {
           memberInfo = await this.memberService.getMemberInfoAdmin(parseInt(request.params.id));
+        } else if (await this.memberService.canStaff(session.id)) {
+          memberInfo = await this.memberService.getMemberInfoAdmin(parseInt(request.params.id));
         } else if (parseInt(request.params.id) === session.id) {
           memberInfo = await this.memberService.getMemberInfo(parseInt(request.params.id));
         } else {

diff --git a/api/src/services/member/member.service.ts b/api/src/services/member/member.service.ts
@@ -67,6 +67,20 @@ export class MemberService {
     return !!roleAssignments.find(assignment => ADMIN_ROLES.includes(assignment.role_id));
   }
 
+  public async canStaff(memberId: number): Promise<boolean> {
+    const roleAssignments = await this.roleAssignmentRepository.getByMemberId(memberId);
+    // Extracted staff roles into a constant for easy management
+    const STAFF_ROLES = [
+      this.roleRepository.roleMap.ColonyLeader,
+      this.roleRepository.roleMap.ColonyDeputy,
+      this.roleRepository.roleMap.NeighborhoodLeader,
+      this.roleRepository.roleMap.NeighborhoodDeputy,
+      this.roleRepository.roleMap.BlockLeader,
+      this.roleRepository.roleMap.BlockDeputy,
+    ];
+    return !!roleAssignments.find(assignment => STAFF_ROLES.includes(assignment.role_id));
+  }
+
   public async joinedPlace(id: number, placeId: number, is3d: number): Promise<void> {
     const now = new Date();
     await this.memberRepository.joinedPlace(id, {
@@ -189,7 +203,6 @@ export class MemberService {
       lastName: member.lastname,
       chatdefault: member.chatdefault,
       primary_role_id: member.primary_role_id,
-      lastAccess: member.last_activity,
     };
   }
 
@@ -212,7 +225,6 @@ export class MemberService {
       username: member.username,
       xp: member.xp,
       chatdefault: member.chatdefault,
-      lastAccess: member.last_activity,
     };
   }
 

diff --git a/api/src/types/views/member-info.view.interface.ts b/api/src/types/views/member-info.view.interface.ts
@@ -21,9 +21,6 @@ export interface MemberInfoView {
   primary_role_id?: number;
   /**add chatdefault */
   chatdefault?: number;
-  /**Last access */
-  lastAccess: Date;
-
 }
 
 export interface MemberAdminView {

diff --git a/spa/src/components/place/home/main2d.vue b/spa/src/components/place/home/main2d.vue
@@ -122,6 +122,7 @@ export default Vue.extend({
     return {
       memberInfo: {},
       canAdmin: false,
+      loaded: false,
 
     };
   },
@@ -154,7 +155,7 @@ export default Vue.extend({
   watch: {
     "$store.data.place.block": {
       handler() {
-        if (this.$store.data.place.block) {
+        if (this.$route.params.username) {
           this.loaded = true;
           this.checkAdmin();
         }