@ozdao/martyrs 0.2.518 → 0.2.520

package/src/modules/organizations/CLAUDE.md

@@ -0,0 +1,259 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Module Overview
+
+The organizations module is a Vue.js/Node.js module that manages organizations, departments, memberships, and invites within the Martyrs application. It follows a modular architecture with separate client and server components.
+
+## Architecture
+
+### Server-Side Structure
+- **Entry Point**: `organizations.server.js` - Initializes models, routes, and policies
+- **Models**: Mongoose schemas for Organization, Department, Membership, and Invite
+- **Controllers**: Handle business logic with caching support using a custom Cache class
+- **Routes**: Express routes for RESTful API endpoints
+- **Middlewares**: Access verification middleware
+- **Policies**: ABAC (Attribute-Based Access Control) policies
+
+### Client-Side Structure
+- **Entry Point**: `organizations.client.js` - Exports components and initializes stores/router
+- **Components**: Vue 3 components organized by type:
+  - `pages/`: Full page components
+  - `forms/`: Popup forms (DepartmentForm, InviteForm, AddExistingMembersForm)
+  - `blocks/`: Reusable UI blocks
+  - `sections/`: Page sections
+  - `elements/`: Small UI elements
+- **Store**: Uses Store class from globals module
+  - `membershipsStore` - manages memberships with handleMembershipUpdate method
+  - `departmentsStore` - manages departments
+  - `invitesStore` - manages invites
+- **Router**: Vue Router configuration with nested routes
+
+## Key Features
+
+1. **Organization Management**: CRUD operations for organizations with owner/member relationships
+2. **Department System**: Hierarchical department structure within organizations
+3. **Membership System**: User roles and permissions within organizations
+4. **Invite System**: Invitation workflow for adding members
+5. **Access Control**: Fine-grained permissions using ABAC
+6. **Caching**: Redis-like caching with tag-based invalidation
+
+## API Endpoints
+
+All modules now follow the standard Store class pattern:
+
+### Organizations
+- `GET /api/organizations` - List organizations with filters
+- `POST /api/organizations/create` - Create new organization
+- `POST /api/organizations/:_id/update` - Update organization
+- `DELETE /api/organizations/:_id/delete` - Delete organization
+
+### Departments
+- `GET /api/departments/read` - Read with query parameters
+- `POST /api/departments/create` - Create new department
+- `PUT /api/departments/update` - Update department
+- `POST /api/departments/delete` - Delete department (expects {_id} in body)
+
+### Memberships
+- `GET /api/memberships/read` - Read with query parameters
+- `POST /api/memberships/create` - Create new membership
+- `PUT /api/memberships/update` - Update membership
+- `POST /api/memberships/delete` - Delete membership (expects {_id} in body)
+
+### Invites
+- `GET /api/invites/read` - Read with query parameters (owner, target, search)
+- `POST /api/invites/create` - Create new invite
+- `PUT /api/invites/update` - Update invite
+- `POST /api/invites/delete` - Delete invite (expects {_id} in body)
+
+## Important Patterns
+
+1. **Aggregation Pipeline**: Complex queries use MongoDB aggregation with dynamic stages
+2. **Caching Strategy**: Results cached with tags for selective invalidation
+3. **Access Control**: Uses ABAC with policies defined in `organizations.policies.js`
+4. **Lookup Configurations**: Modular lookup configs for related data
+5. **Query Processing**: Utility functions for building dynamic queries
+
+## Model Structures
+
+### Organization Model
+```javascript
+{
+  owner: ObjectId (ref: 'User', required),
+  official: Boolean (default: false),
+  types: Array (required),
+  profile: {
+    photo: String,
+    name: String (required),
+    description: String,
+    tags: [String]
+  },
+  contacts: {
+    email: String,
+    website: String,
+    phone: String,
+    address: String
+  },
+  socials: {
+    telegram: String,
+    twitter: String,
+    facebook: String,
+    instagram: String,
+    youtube: String
+  },
+  rating: {
+    popularity: Number (0-1),
+    median: Number (0-5),
+    amount: Number
+  },
+  accesses: AccessesSchema,
+  views: Number (default: 0),
+  timestamps: true
+}
+```
+
+### Department Model
+```javascript
+{
+  owner: ObjectId (ref: 'User'),
+  organization: ObjectId (ref: 'Organization'),
+  hidden: Boolean (default: false),
+  profile: {
+    photo: String,
+    name: String (required),
+    description: String,
+    categories: [String]
+  },
+  worktime: [{
+    day: String,
+    time: { start: String, end: String }
+  }],
+  delivery: [String],
+  payment: [String],
+  members: [{
+    user: ObjectId (ref: 'User'),
+    position: String (default: 'Member')
+  }],
+  subdepartments: [ObjectId (ref: 'Department')],
+  accesses: AccessesSchema,
+  timestamps: true
+}
+```
+
+### Membership Model
+```javascript
+{
+  user: ObjectId (ref: 'User', required),
+  type: String (enum: ['organization', 'department', 'user'], required),
+  role: String (default: 'subscriber'),
+  label: String (default: 'subscriber'),
+  target: ObjectId (dynamic ref based on type),
+  timestamps: true
+}
+```
+
+### Invite Model
+```javascript
+{
+  code: String (required, unique),
+  status: String (enum: ['active', 'used', 'deactivated']),
+  role: String (default: 'member'),
+  // From credentials schema:
+  phone: String,
+  email: String,
+  apple_id: String,
+  // From ownership schema:
+  owner: { type: String, target: ObjectId },
+  creator: { type: String, target: ObjectId, hidden: Boolean },
+  timestamps: true
+}
+```
+
+### Accesses Schema
+Permission structure for modules:
+```javascript
+{
+  categories: { create, read, edit, delete },
+  rents: { create, read, edit, delete },
+  spots: { create, read, edit, delete },
+  posts: { create, read, edit, delete },
+  events: { create, read, edit, delete },
+  tickets: { create, read, edit, delete },
+  gallery: { read, create, edit, delete },
+  members: { read, edit, delete },
+  inventory: { read, edit, delete },
+  products: { read, edit, delete },
+  departments: { read, edit, delete },
+  orders: { read, confirm, delete }
+}
+```
+All permissions are Boolean fields defaulting to false.
+
+## Key Interfaces
+
+### API Request/Response Formats
+
+#### Organization Query Parameters
+- `_id`: Single organization ID
+- `types`: Filter by organization types
+- `official`: Filter official organizations
+- `search`: Text search in organization names
+- `sortParam`, `sortOrder`: Sorting options
+- `skip`, `limit`: Pagination
+- `user`: User ID for membership filtering
+- `postable`: Filter by postable status
+- `contain`: Filter by contained elements
+- `prices`: Price range filtering (when products included)
+
+#### Lookup Options
+Request related data using query parameters:
+- `memberships`: Include membership data
+- `products`: Include products
+- `spots`: Include locations
+- `members`: Include member details
+
+### Store Integration
+
+All stores use the Store class from `@martyrs/src/modules/globals/views/classes/globals.store.js`:
+
+```javascript
+import Store from '@martyrs/src/modules/globals/views/classes/globals.store.js';
+
+const membershipsStore = new Store('/api/memberships');
+const departmentsStore = new Store('/api/departments');
+const invitesStore = new Store('/api/invites');
+```
+
+#### membershipsStore.handleMembershipUpdate
+Special method for updating user state when membership changes:
+```javascript
+membershipsStore.handleMembershipUpdate(user, membership, status, target, statusName, statusNumber)
+```
+
+### Feed Component Integration
+Use v-model:items pattern for reactive state:
+```vue
+<Feed
+  v-model:items="membersList"
+  :store="{
+    read: (options) => membershipsStore.read(options)
+  }"
+  :options="{
+    target: route.params._id,
+    role: ['member','owner']
+  }"
+>
+```
+
+### Controller Response Format
+- **Read operations**: Return array of items directly
+- **Delete operations**: Return the deleted object
+- **Create/Update**: Return the created/updated object
+
+## Dependencies
+
+- Mongoose for MongoDB ODM
+- Express for routing
+- Vue 3 with Composition API
+- Custom modules from `@martyrs/src/modules/globals/`

package/src/modules/organizations/components/blocks/CardDepartment.vue

@@ -3,28 +3,7 @@
 
     <div class="pd-medium w-100">
 
-      <router-link 
-        :to="{
-          name: 'Department Edit', 
-          params: {
-            _id: props.organization,
-            department: department._id
-          }
-        }" 
-        class="
-          cursor-pointer 
-          pos-absolute pos-t-regular pos-r-regular
-          radius-extra pd-thin bg-second
-        "
-      >
-        <IconEdit
-          class="i-regular"
-          classes="fill-white"
-        />
-      </router-link>
-
       <h3 
-        @click="$router.push(`/organizations/${props.organization}/departments/${department._id}`)"
         class="mn-b-small w-100"
         v-html="department.profile.name"
       />
@@ -39,7 +18,7 @@
           :photo="member.user.profile.photo"
           :name="member.user.profile.name || member.user.phone || member.user.email || member.user._id"
           :position="member.position" 
-          @click="$router.push(`/app/profile/${member.user._id}`)" 
+          @click="$router.push({ name: 'User Profile', params: { _id: member.user._id } })" 
         />
       </ul>
     </div>

package/src/modules/organizations/components/blocks/Socials.vue

@@ -7,7 +7,7 @@
             target="_blank" 
             class="i-big bg-second t-white flex-nowrap flex-center flex radius-extra"
         >
-            <component :is="resolveSocialIcon(social.name)" class="i-medium"></component>
+            <component :is="resolveSocialIcon(social.name)" :fill="'rgb(var(--white))'" class="i-medium"></component>
         </a> 
     </div>
 </template>

package/src/modules/organizations/components/elements/ButtonToggleMembership.vue

@@ -13,7 +13,7 @@
   
   import { ref } from 'vue'
   import * as auth from '@martyrs/src/modules/auth/views/store/auth.js'
-  import * as memberships from '@martyrs/src/modules/organizations/store/memberships.js'
+  import membershipsStore from '@martyrs/src/modules/organizations/store/memberships.store.js'
 
   const emits = defineEmits(['updateMembership'])
 
@@ -64,7 +64,7 @@
         target: props.target
       };
 
-      const response = await memberships.actions.create(membershipData);
+      const response = await membershipsStore.create(membershipData);
 
       emits('updateMembership', { 
         membership: response, 
@@ -86,7 +86,7 @@
     };
 
     try {
-      const response = await memberships.actions.delete(membershipData);
+      const response = await membershipsStore.delete(membershipData);
 
       emits('updateMembership', {
         membership: response, 

package/src/modules/organizations/components/forms/AddExistingMembersForm.vue

@@ -0,0 +1,191 @@
+<template>
+  <div>
+    <p class="mn-b-thin t-transp p-medium">Select users to add to the organization:</p>
+
+    <Feed
+      :search="{
+        placeholder: 'Search users...',
+        class: 'bg-light mn-b-thin'
+      }"
+      :states="{
+        empty: {
+          title: 'No Users Found',
+          description: 'No users match your search criteria.'
+        },
+        loading: {
+          title: 'Loading users...'
+        }
+      }"
+      :store="{
+        read: (options) => fetchFilteredUsers(options),
+        state: null
+      }"
+      :options="{}"
+      v-slot="{ items }"
+      class="bg-light pd-medium radius-medium h-max-30r o-scroll mn-b-thin"
+    >
+      <div
+        v-for="user in items"
+        :key="user._id"
+        @click="() => toggleUserSelection(user)"
+        class="pd-thin radius-medium w-100 mn-b-thin cursor-pointer hover-scale-1"
+        :class="getUserCardClass(user)"
+      >
+        <div class="flex-nowrap flex-v-center flex gap-thin">
+          <div class="aspect-1x1 h-3r flex-child-default radius-small o-hidden">
+            <img
+              v-if="user.profile?.photo"
+              :src="user.profile.photo"
+              alt="User photo"
+              class="w-100 h-100 object-fit-cover"
+            />
+            <PlaceholderUserpic v-else class="w-100 h-100" />
+          </div>
+          
+          <div class="w-100">
+            <p class="t-medium">{{ user.profile?.name || user.phone || user.email || 'Unnamed user' }}</p>
+            <p class="t-small t-transp">{{ user.email || user.phone || 'No contact info' }}</p>
+          </div>
+
+          <div v-if="isUserInOrganization(user)" class="pd-nano pd-h-thin radius-thin bg-grey">
+            <span class="t-small">Already member</span>
+          </div>
+          
+          <div v-else-if="isUserSelected(user)" class="pd-nano pd-h-thin radius-thin bg-green">
+            <IconCheck class="i-small" fill="rgb(var(--white))" />
+          </div>
+        </div>
+      </div>
+    </Feed>
+
+    <div v-if="selectedUsers.length > 0" class="mn-b-thin">
+      <p class="t-small t-transp">Selected: {{ selectedUsers.length }} user(s)</p>
+    </div>
+
+    <Button
+      :submit="addSelectedUsers"
+      :disabled="selectedUsers.length === 0"
+      class="w-100 bg-main"
+    >
+      Add {{ selectedUsers.length }} user(s) to organization
+    </Button>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue';
+
+import Button from '@martyrs/src/components/Button/Button.vue';
+import Feed from '@martyrs/src/components/Feed/Feed.vue';
+
+import PlaceholderUserpic from '@martyrs/src/modules/icons/placeholders/PlaceholderUserpic.vue';
+import IconCheck from '@martyrs/src/modules/icons/navigation/IconCheck.vue';
+
+import * as users from '@martyrs/src/modules/auth/views/store/users.js';
+import membershipsStore from '@martyrs/src/modules/organizations/store/memberships.store.js';
+import * as globals from '@martyrs/src/modules/globals/views/store/globals.js';
+
+const props = defineProps({
+  organizationId: {
+    type: String,
+    required: true
+  },
+  existingMembers: {
+    type: Array,
+    default: () => []
+  }
+});
+
+const emit = defineEmits(['users-added']);
+
+// State
+const selectedUsers = ref([]);
+const organizationMembers = ref([]);
+
+// Check if user is already in organization
+function isUserInOrganization(user) {
+  return organizationMembers.value.some(member => 
+    member.user._id === user._id || member.user === user._id
+  );
+}
+
+// Check if user is selected
+function isUserSelected(user) {
+  return selectedUsers.value.some(selected => selected._id === user._id);
+}
+
+// Get card styling based on user status
+function getUserCardClass(user) {
+  if (isUserInOrganization(user)) {
+    return 'bg-grey opacity-60 cursor-not-allowed';
+  }
+  if (isUserSelected(user)) {
+    return 'bg-green-light';
+  }
+  return 'bg-white hover-bg-light';
+}
+
+// Toggle user selection
+function toggleUserSelection(user) {
+  if (isUserInOrganization(user)) {
+    globals.actions.setError({ message: 'This user is already a member of the organization' });
+    return;
+  }
+
+  const index = selectedUsers.value.findIndex(u => u._id === user._id);
+  if (index > -1) {
+    selectedUsers.value.splice(index, 1);
+  } else {
+    selectedUsers.value.push(user);
+  }
+}
+
+// Fetch users and organization members
+async function fetchFilteredUsers(options) {
+  try {
+    // Fetch organization members
+    const membersResponse = await membershipsStore.read({
+      target: props.organizationId,
+      role: ['member', 'owner']
+    });
+    organizationMembers.value = membersResponse || [];
+
+    // Fetch all users
+    const usersResponse = await users.actions.read(options);
+    return usersResponse;
+  } catch (error) {
+    console.error('Error fetching users:', error);
+    return [];
+  }
+}
+
+// Add selected users to organization
+async function addSelectedUsers() {
+  if (selectedUsers.value.length === 0) return;
+
+  try {
+    const promises = selectedUsers.value.map(user => 
+      membershipsStore.create({
+        user: user._id,
+        type: 'organization',
+        target: props.organizationId,
+        role: 'member',
+        label: 'member'
+      })
+    );
+
+    const results = await Promise.all(promises);
+    
+    emit('users-added', results);
+    selectedUsers.value = [];
+    
+    globals.actions.setSuccess({ 
+      message: `Successfully added ${results.length} user(s) to the organization` 
+    });
+  } catch (error) {
+    console.error('Error adding users:', error);
+    globals.actions.setError(error);
+    throw error;
+  }
+}
+</script>