@ozdao/martyrs 0.2.491 → 0.2.493

package/src/modules/music/routes/tracks.routes.js

@@ -17,7 +17,7 @@ export default function setupTracksRoutes(app, db) {
     modelName: 'track',
     basePath: '/api/tracks',
     
-    auth: true,
+    auth: { read: false },
     
     verifiers: {
       create: verifier.createVerifier,
@@ -28,6 +28,10 @@ export default function setupTracksRoutes(app, db) {
     
     abac: abac,
     
+    policies: {
+      read: { enabled: false }
+    },
+    
     cache: {
       enabled: true,
       ttl: 300,
@@ -40,6 +44,12 @@ export default function setupTracksRoutes(app, db) {
     }
   });
 
+  // Отключаем ABAC для кастомных действий
+  tracksCRUD.policies.disableForAction('get-by-url');
+  tracksCRUD.policies.disableForAction('recent');
+  tracksCRUD.policies.disableForAction('popular');
+  tracksCRUD.policies.disableForAction('by-genre');
+
   // Перенос кастомных роутов через addAction для обратной совместимости
 
   // Get track by URL - /api/tracks/url/:url
@@ -47,9 +57,15 @@ export default function setupTracksRoutes(app, db) {
     method: 'get',
     path: '/url/:url',
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
-        const track = await db.track.findOne({ url: req.params.url });
+        const track = await db.track
+          .findOne({ url: req.params.url })
+          .populate('artist', 'name url photoUrl isVerified')
+          .populate('album', 'title url coverArt')
+          .populate('genre', 'name url');
+        
         if (!track) {
           return res.status(404).json({ error: 'Track not found' });
         }
@@ -82,6 +98,7 @@ export default function setupTracksRoutes(app, db) {
     method: 'get',
     path: '/recent',
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const limit = parseInt(req.query.limit) || 10;
@@ -90,6 +107,8 @@ export default function setupTracksRoutes(app, db) {
             status: 'published',
             isPublic: true,
           })
+          .populate('artist', 'name url photoUrl isVerified')
+          .populate('album', 'title url coverArt')
           .sort({ createdAt: -1 })
           .limit(limit);
         res.json(recentTracks);
@@ -105,6 +124,7 @@ export default function setupTracksRoutes(app, db) {
     method: 'get',
     path: '/popular',
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const limit = parseInt(req.query.limit) || 10;
@@ -113,6 +133,8 @@ export default function setupTracksRoutes(app, db) {
             status: 'published',
             isPublic: true,
           })
+          .populate('artist', 'name url photoUrl isVerified')
+          .populate('album', 'title url coverArt')
           .sort({ playCount: -1 })
           .limit(limit);
         res.json(popularTracks);
@@ -128,6 +150,7 @@ export default function setupTracksRoutes(app, db) {
     method: 'get',
     path: '/genre/:genreId',
     auth: false,
+    abac: { enabled: false },
     handler: async (req, res) => {
       try {
         const tracks = await db.track
@@ -136,6 +159,8 @@ export default function setupTracksRoutes(app, db) {
             status: 'published',
             isPublic: true,
           })
+          .populate('artist', 'name url photoUrl isVerified')
+          .populate('album', 'title url coverArt')
           .sort({ releaseDate: -1 });
         res.json(tracks);
       } catch (error) {

package/src/modules/music/store/artists.js

@@ -14,6 +14,7 @@ export const state = reactive({
   discography: {
     albums: [],
     singles: [],
+    tracks: [],
   },
   relatedArtists: [],
   isLoading: false,
@@ -72,7 +73,6 @@ export const actions = {
     try {
       const response = await fetch(`${process.env.API_URL}/api/artists/url/${url}`);
       const artist = await response.json();
-      state.currentArtist = artist;
 
       // Fetch artist discography
       await this.fetchArtistDiscography(artist._id);
@@ -80,6 +80,9 @@ export const actions = {
       // Fetch related artists
       await this.fetchRelatedArtists(artist._id);
 
+      // Set artist only after all data is loaded
+      state.currentArtist = artist;
+
       return artist;
     } catch (error) {
       console.error('Error fetching artist by URL:', error);
@@ -94,11 +97,12 @@ export const actions = {
       state.discography = {
         albums: discography.albums || [],
         singles: discography.singles || [],
+        tracks: discography.tracks || [],
       };
       return discography;
     } catch (error) {
       console.error('Error fetching artist discography:', error);
-      return { albums: [], singles: [] };
+      return { albums: [], singles: [], tracks: [] };
     }
   },
 

package/src/modules/music/store/player.js

@@ -97,7 +97,11 @@ export const actions = {
     }
 
     // Log play via WebSocket if connected
+    console.log('Player: Attempting to log play event for track:', track._id);
+    console.log('Player: WebSocket connected?', globalWebSocket.isSocketConnected());
+    
     if (globalWebSocket.isSocketConnected()) {
+      console.log('Player: Sending startPlaying event via WebSocket');
       globalWebSocket.send({
         module: 'music-streaming',
         action: 'startPlaying',
@@ -107,6 +111,8 @@ export const actions = {
           deviceInfo: navigator.userAgent,
         },
       });
+    } else {
+      console.log('Player: WebSocket not connected, play count will not be incremented');
     }
   },
 

package/src/modules/music/store/tracks.js

@@ -13,6 +13,7 @@ export const state = reactive({
   featured: [],
   userTracks: [],
   currentTrack: null,
+  relatedTracks: [],
   isLoading: false,
   loadingPopular: false,
   loadingRecent: false,
@@ -229,4 +230,34 @@ export const actions = {
       return [];
     }
   },
+
+  async fetchRelatedTracks(trackUrl) {
+    try {
+      // Если есть currentTrack, ищем треки того же артиста
+      if (state.currentTrack && state.currentTrack.artist) {
+        const artistId = typeof state.currentTrack.artist === 'object' 
+          ? state.currentTrack.artist._id 
+          : state.currentTrack.artist;
+          
+        const queryParams = new URLSearchParams();
+        queryParams.append('artist', artistId);
+        queryParams.append('limit', '5');
+        
+        const response = await fetch(`${process.env.API_URL}/api/tracks/read?${queryParams.toString()}`);
+        const tracks = await response.json();
+        
+        // Исключаем текущий трек
+        const relatedTracks = tracks.filter(track => track._id !== state.currentTrack._id);
+        state.relatedTracks = relatedTracks;
+        return relatedTracks;
+      }
+      
+      state.relatedTracks = [];
+      return [];
+    } catch (error) {
+      console.error('Error fetching related tracks:', error);
+      state.relatedTracks = [];
+      return [];
+    }
+  },
 };

package/src/modules/music/websocket/streaming.handler.js

@@ -5,9 +5,11 @@ export default (function (db) {
     // Handle WebSocket messages for music streaming
     handleStreamingMessage: async (ws, message) => {
       try {
+        console.log('StreamingHandler: Received message:', { action: message.action, data: message.data });
         const { action, data } = message;
         switch (action) {
           case 'startPlaying':
+            console.log('StreamingHandler: Processing startPlaying event for track:', data.trackId, 'user:', ws.userId);
             // Log play event
             if (ws.userId && data.trackId) {
               await db.playHistory.create({
@@ -18,8 +20,12 @@ export default (function (db) {
                 playedFrom: data.from || 'other',
                 contextId: data.contextId || null,
               });
+              console.log('StreamingHandler: Created play history record');
+              
               // Increment play count
-              await db.track.findByIdAndUpdate(data.trackId, { $inc: { playCount: 1 } });
+              const trackUpdate = await db.track.findByIdAndUpdate(data.trackId, { $inc: { playCount: 1 } }, { new: true });
+              console.log('StreamingHandler: Updated track playCount to:', trackUpdate?.playCount);
+              
               // Acknowledge
               ws.send(
                 JSON.stringify({

package/src/modules/rents/controllers/services/rents.services.js

@@ -21,8 +21,8 @@ const queryValidatorConfig = {
   skip: { rule: 'optional', validator: Validator.schema().number().integer().min(0), default: 0 },
   limit: {
     rule: 'optional',
-    validator: Validator.schema().number().integer().min(1).max(100),
-    default: 10,
+    validator: Validator.schema().number().integer().min(1).max(1000),
+    default: 1000,
   },
   productId: { rule: 'optional', validator: Validator.schema().string(), default: null },
   variantId: { rule: 'optional', validator: Validator.schema().string(), default: null },

package/src/modules/rents/rents.client.js

@@ -6,7 +6,7 @@ import { createRentsRoutes } from './views/router/rents.router.js';
 
 // Views
 import CardRent from './views/components/blocks/CardRent.vue';
-import GanttChart from './views/components/pages/GanttChart.vue';
+import GanttChart from './views/components/pages/Gant/GanttChart.vue';
 import Rents from './views/components/pages/Rents.vue';
 import RentsEdit from './views/components/pages/RentsEdit.vue';
 

package/src/modules/rents/views/components/pages/Gant/DateLabel.vue

@@ -0,0 +1,17 @@
+<template>
+  <div class="flex flex-v-center gap-thin">
+    <IconCalendar class="i-small" />
+    <span class="t-medium">{{ dateText }}</span>
+  </div>
+</template>
+
+<script setup>
+import IconCalendar from '@martyrs/src/modules/icons/entities/IconCalendar.vue'
+
+defineProps({
+  dateText: {
+    type: String,
+    required: true
+  }
+})
+</script>

package/src/modules/rents/views/components/pages/Gant/GanttBar.vue

@@ -0,0 +1,52 @@
+<template>
+  <div 
+    class="gantt-bar pos-absolute radius-small cursor-pointer shadow-small transition-ease-out hover-scale-0"
+    :class="barClass"
+    :style="barStyle"
+    @click="$emit('click')"
+  >
+    <div class="pd-micro t-micro t-white t-truncate">
+      {{ bar.item.productDetails.name || 'Task' }}
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+
+const props = defineProps({
+  bar: { type: Object, required: true },
+  view: { type: String, required: true }
+})
+
+const emit = defineEmits(['click'])
+
+// Bar class based on status
+const barClass = computed(() => {
+  const statusMap = {
+    active: 'bg-main',
+    completed: 'bg-green',
+    canceled: 'bg-red',
+    pending : 'bg-grey',
+    default: 'bg-second'
+  }
+  
+  return statusMap[props.bar.status] || statusMap.default
+})
+
+// Bar style
+const barStyle = computed(() => ({
+  left: props.bar.left + 'px',
+  width: props.bar.width + 'px',
+  top: (10 + props.bar.row * 22) + 'px',
+  height: '20px',
+  zIndex: 10 - props.bar.row
+}))
+</script>
+
+<style>
+.gantt-bar {
+  max-height: 20px;
+  line-height: 20px;
+}
+</style>