[FEAT] add a shuffle in the artist list.

This feature take a random on the artist and keep the 25 first and ge a single track for each artist.
[FEAT] add a tool to manage a shuffle of an array
2025-01-11 19:30:01 +01:00 · 2025-01-11 19:28:51 +01:00 · 2025-01-11 19:28:30 +01:00 · 2025-01-11 18:12:27 +01:00 · 2025-01-11 17:33:31 +01:00 · 2025-01-11 17:33:21 +01:00
8 changed files with 75 additions and 94 deletions
--- a/back/Dockerfile
+++ b/back/Dockerfile
@ -1,7 +1,8 @@
-FROM maven:3-openjdk-18 AS build
+FROM maven:3-openjdk-23 AS build

 COPY pom.xml /tmp/
 COPY src /tmp/src/
+COPY Formatter.xml /tmp/
 WORKDIR /tmp/
 RUN mvn clean compile assembly:single

--- a/back/pom.xml
+++ b/back/pom.xml
@ -3,11 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.kar</groupId>
 	<artifactId>karusic</artifactId>
-	<version>1.0.5-SNAPSHOT</version>
+	<version>1.1.1-SNAPSHOT</version>
 	<properties>
-		<maven.compiler.version>3.1</maven.compiler.version>
-		<maven.compiler.source>21</maven.compiler.source>
-		<maven.compiler.target>21</maven.compiler.target>
+		<maven.compiler.version>3.13.0</maven.compiler.version>
+		<maven.compiler.source>23</maven.compiler.source>
+		<maven.compiler.target>23</maven.compiler.target>
 		<maven.dependency.version>3.1.1</maven.dependency.version>
 	</properties>
 	<repositories>
@ -47,7 +47,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
 			<artifactId>jackson-datatype-jsr310</artifactId>
-			<version>2.18.0-rc1</version>
+			<version>2.18.1</version>
 		</dependency>
 		<!--
 		************************************************************ 
@ -113,7 +113,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>3.2.1</version>
+				<version>4.0.0-beta-1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@ -127,10 +127,12 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.0.0-M5</version>
+				<version>3.2.5</version>
 			</plugin>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.7.1</version>
 				<configuration>
 					<archive>
 						<manifest>
@ -142,81 +144,21 @@
 					</descriptorRefs>
 				</configuration>
 			</plugin>
-			<!-- Create coverage -->
-			<!--
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.10</version>
-				<executions>
-					<execution>
-						<id>prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>report</id>
-						<phase>test</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>jacoco-check</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<configuration>
-							<rules>
-								<rule>
-									<element>PACKAGE</element>
-									<limits>
-										<limit>
-											<counter>LINE</counter>
-											<value>COVEREDRATIO</value>
-											<minimum>0.50</minimum>
-										</limit>
-									</limits>
-								</rule>
-							</rules>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			-->
 			<!-- Java-doc generation for stand-alone site -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.3.0</version>
 				<configuration>
 					<show>private</show>
 					<nohelp>true</nohelp>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>exec-maven-plugin</artifactId>
-				<version>3.1.0</version>
-				<executions>
-					<execution>
-						<id>exec-application</id>
-						<phase>package</phase>
-						<goals>
-							<goal>java</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<mainClass>org.kar.karusic.WebLauncher</mainClass>
-				</configuration>
-			</plugin>
 			<!-- Check the style of the code -->
 			<plugin>
 				<groupId>net.revelc.code.formatter</groupId>
 				<artifactId>formatter-maven-plugin</artifactId>
-				<version>2.23.0</version>
+				<version>2.24.1</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
 					<lineEnding>LF</lineEnding>
@ -247,14 +189,6 @@
 				<configuration>
 					<includeFilterFile>spotbugs-security-include.xml</includeFilterFile>
 					<excludeFilterFile>spotbugs-security-exclude.xml</excludeFilterFile>
-					<!--<plugins>
-						<plugin>
-							<groupId>com.h3xstream.findsecbugs</groupId>
-							<artifactId>findsecbugs-plugin</artifactId>
-							<version>1.12.0</version>
-						</plugin>
-					</plugins>
-					-->
 				</configuration>
 			</plugin>
 		</plugins>
@ -265,7 +199,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>3.2.0</version>
+				<version>3.3.0</version>
 				<configuration>
 					<show>public</show>
 				</configuration>
--- a/back/src/org/kar/karusic/migration/Initialization.java
+++ b/back/src/org/kar/karusic/migration/Initialization.java
@ -18,8 +18,7 @@ public class Initialization extends MigrationSqlStep {
 	private static final Logger LOGGER = LoggerFactory.getLogger(Initialization.class);

 	public static final int KARSO_INITIALISATION_ID = 1;
-	public static final List<Class<?>> CLASSES_BASE = List.of(Album.class, Artist.class, Data.class, Gender.class,
-			Playlist.class, Track.class, User.class);
+	public static final List<Class<?>> CLASSES_BASE = List.of(Album.class, Artist.class, Data.class, Gender.class, Playlist.class, Track.class, User.class);

 	@Override
 	public String getName() {
--- a/front/pnpm-lock.yaml
+++ b/front/pnpm-lock.yaml
@ -9,16 +9,16 @@ importers:
  .:
    dependencies:
      '@chakra-ui/anatomy':
-        specifier: ^2.2.2
-        version: 2.3.4
+        specifier: ~2.2.2
+        version: 2.2.2
      '@chakra-ui/cli':
-        specifier: ^2.4.1
+        specifier: ~2.4.1
        version: 2.4.1
      '@chakra-ui/react':
-        specifier: ^2.8.2
+        specifier: ~2.8.2
        version: 2.8.2(@emotion/react@11.14.0(@types/react@18.3.8)(react@18.3.1))(@emotion/styled@11.14.0(@emotion/react@11.14.0(@types/react@18.3.8)(react@18.3.1))(@types/react@18.3.8)(react@18.3.1))(@types/react@18.3.8)(framer-motion@11.15.0(@emotion/is-prop-valid@1.3.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
      '@chakra-ui/theme-tools':
-        specifier: ^2.2.6
+        specifier: ~2.2.6
        version: 2.2.6(@chakra-ui/styled-system@2.12.0(react@18.3.1))(react@18.3.1)
      '@dnd-kit/core':
        specifier: 6.3.1
--- a/front/src/environment.ts
+++ b/front/src/environment.ts
@ -25,9 +25,9 @@ const environment_back_prod: Environment = {
    karso: `${serverSSOAddress}/karso/api`,
  },
  ssoSite: `${serverSSOAddress}/karso/`,
-  ssoSignIn: `${serverSSOAddress}/karso/signin/karusic-dev/`,
-  ssoSignUp: `${serverSSOAddress}/karso/signup/karusic-dev/`,
-  ssoSignOut: `${serverSSOAddress}/karso/signout/karusic-dev/`,
+  ssoSignIn: `${serverSSOAddress}/karso/signin/karusic/`,
+  ssoSignUp: `${serverSSOAddress}/karso/signup/karusic/`,
+  ssoSignOut: `${serverSSOAddress}/karso/signout/karusic/`,
  tokenStoredInPermanentStorage: false,
 };

@ -45,7 +45,7 @@ const environment_local: Environment = {
  ssoSignUp: `${serverSSOAddress}/karso/signup/karusic-dev/`,
  ssoSignOut: `${serverSSOAddress}/karso/signout/karusic-dev/`,
  tokenStoredInPermanentStorage: false,
-  //replaceDataToRealServer: true,
+  replaceDataToRealServer: true,
 };

 const environment_full_local: Environment = {
--- a/front/src/scene/artist/ArtistsPage.tsx
+++ b/front/src/scene/artist/ArtistsPage.tsx
@ -1,31 +1,69 @@
 import { useState } from 'react';

-import { Flex, Text, Wrap, WrapItem } from '@chakra-ui/react';
+import { Button, Flex, Text, Tooltip, Wrap, WrapItem } from '@chakra-ui/react';
 import { LuUser } from 'react-icons/lu';
 import { useNavigate } from 'react-router-dom';

-import { Artist } from '@/back-api';
+import { Artist, Track } from '@/back-api';
 import { Covers } from '@/components/Cover';
 import { EmptyEnd } from '@/components/EmptyEnd';
 import { PageLayout } from '@/components/Layout/PageLayout';
 import { SearchInput } from '@/components/SearchInput';
-import { TopBar } from '@/components/TopBar/TopBar';
+import { BUTTON_TOP_BAR_PROPERTY, TopBar } from '@/components/TopBar/TopBar';
 import { useArtistService, useOrderedArtists } from '@/service/Artist';
 import { useThemeMode } from '@/utils/theme-tools';
 import { BASE_WRAP_HEIGHT, BASE_WRAP_ICON_SIZE, BASE_WRAP_SPACING, BASE_WRAP_WIDTH } from '@/constants/genericSpacing';
+import { MdOutlineForkRight } from 'react-icons/md';
+import { useActivePlaylistService } from '@/service/ActivePlaylist';
+import { shuffleArray } from '@/utils/arrayTools';
+import { useTrackService } from '@/service/Track';
+import { DataTools, TypeCheck } from '@/utils/data-tools';
+const LIMIT_RANDOM_VALUES = 25;

 export const ArtistsPage = () => {
  const { mode } = useThemeMode();
  const [filterName, setFilterName] = useState<string | undefined>(undefined);
  const navigate = useNavigate();
+  const { playInList } = useActivePlaylistService();
  const onSelectItem = (data: Artist) => {
    navigate(`/artist/${data.id}/`);
  };
  const { dataArtist } = useOrderedArtists(filterName);
+  const { store: trackStore } = useTrackService();
+  const onRandomPlay = () => {
+    const data = shuffleArray(dataArtist)
+    const playingList: number[] = [];
+    for (let i = 0; i < Math.min(data.length, LIMIT_RANDOM_VALUES); i++) {
+      const selectedArtist: Artist = data[i];
+      const listArtistTracks: Track[] = DataTools.getsWhere(
+        trackStore.data,
+        [
+          {
+            check: TypeCheck.CONTAINS,
+            key: 'artists',
+            value: selectedArtist.id,
+          },
+        ],
+        []
+      );
+      console.log(`[${selectedArtist.id}] Find Tracks: ${listArtistTracks}`);
+      if (listArtistTracks.length === 0) {
+        continue;
+      }
+      playingList.push(listArtistTracks[Math.floor(Math.random() * listArtistTracks.length)].id);
+    }
+    playInList(0, playingList)
+  }
+
  return (
    <>
      <TopBar title="All artists">
        <SearchInput onChange={setFilterName} />
+        <Tooltip label="Random play">
+          <Button {...BUTTON_TOP_BAR_PROPERTY} onClick={onRandomPlay}>
+            <MdOutlineForkRight />
+          </Button>
+        </Tooltip>
      </TopBar>
      <PageLayout>
        <Wrap spacing={BASE_WRAP_SPACING} marginX="auto" padding="20px" justify="center">
--- a/front/src/utils/arrayTools.ts
+++ b/front/src/utils/arrayTools.ts
@ -10,4 +10,13 @@ export function arrayUnique(array: any[]) {
    }

    return a;
+}
+
+export function shuffleArray<T>(array: T[]): T[] {
+    const out = [...array];
+    for (let i = out.length - 1; i > 0; i--) {
+        const j = Math.floor(Math.random() * (i + 1));
+        [out[i], out[j]] = [out[j], out[i]];
+    }
+    return out;
 }
--- a/version.txt
+++ b/version.txt
@ -1 +1 @@
-1.0.5-dev
+1.1.1-dev
Author	SHA1	Message	Date
Edouard DUPIN	01fad1b9d4	[FEAT] add a shuffle in the artist list. This feature take a random on the artist and keep the 25 first and ge a single track for each artist.	2025-01-11 19:30:01 +01:00
Edouard DUPIN	371bea79f9	[FEAT] add a tool to manage a shuffle of an array	2025-01-11 19:28:51 +01:00
Edouard DUPIN	35725e1320	[FIX] sign-in in production mode	2025-01-11 19:28:30 +01:00
Edouard DUPIN	d6a8c7d23f	[FIX] build version	2025-01-11 18:12:27 +01:00
Edouard DUPIN	3c604e9593	[VERSION] update dev tag version	2025-01-11 17:33:31 +01:00
Edouard DUPIN	43d8108270	[RELEASE] Release v1.1.0	2025-01-11 17:33:21 +01:00