Add: Match Services

bob_party/App.tsx

@@ -9,10 +9,15 @@ import { useUserStore } from './src/context/userContext';
 import ManagerConversation from './src/services/conversationService/managerConversation'
 import { LoaderConversationApi } from './src/services/conversationService/loaderConversationApi'
 import { FakeSaverConversation } from './src/services/conversationService/fakeSaverConversation'
+import ManagerMatch from './src/services/matchServices/managerMatch'
+import LoaderMatchApi from './src/services/matchServices/loaderMatchApi'
+import SaverMatchApi from './src/services/matchServices/saverMatchApi'
 
 
 export const MANAGER_USER = new ManagerUser(new LoaderUserApi, new FakeSaverUser);  
 export const MANAGER_CONVERSATION = new ManagerConversation(new LoaderConversationApi, new FakeSaverConversation);
+export const MANAGER_MATCH = new ManagerMatch(new LoaderMatchApi, new SaverMatchApi);  
+
   
   export default function App() {
 

bob_party/src/Games/CookieClicker/cookieClicker.tsx

@@ -11,18 +11,18 @@ import {
 } from 'react-native'
 import { MANAGER_USER } from '../../../App';
 import { useUserStore } from '../../context/userContext';
-import { Match } from '../../core/match';
+import { Match } from '../../core/Match/match';
 import { User } from '../../core/User/user';
 
 
-function CookieClicker(props: { navigation: any, match:Match}){
+function CookieClicker(props: { navigation: any}){
+  const { navigation } = props
+
 
   const GAMING_TIME=15;
 
   const setUser = useUserStore((state) => state.setUser);
 
-  const nav = props.navigation;
-  const match=props.match;
 
   const [count, setCount] = useState(0);
   const [money, setMoney] = useState(0);
@@ -85,11 +85,14 @@ function CookieClicker(props: { navigation: any, match:Match}){
     let tmp: User | null;
     tmp=MANAGER_USER.getCurrentUser();
     if (tmp!=null){
+      /*
       if (match.getTabUsers().includes(tmp)){
         match.updatePostMatch(tmp, count);
         setUser(tmp);
-        nav.goBack();
+        
       }
+      */
+      navigation.goBack();
     }
   }
 

bob_party/src/components/GameComponent.tsx

@@ -19,10 +19,10 @@ FC<{game: Game, nav: any}> =
 {      
     return (
         <View>
-            <Pressable onPress={() => nav.navigate('')}>
+            <Pressable onPress={() => nav.navigate("CookieClicker")}>
                 <Image
                     style={styles.image}
-                    source={game.getImageSource()}
+                    source={{uri: game.getImageSource()}}
                 />
                 <Text style={styles.name}>{game.getName()}</Text>
             </Pressable>

bob_party/src/components/Skin.tsx

@@ -103,7 +103,7 @@ FC<{nav : any, skin: Skin, state: String}> =
         case 'icon':
             return (
                 <View>
-                    <Image source={skin.getSkinSource()} style={styles.icon}/>
+                    <Image source={{uri: skin.getSkinSource()}} style={styles.icon}/>
                 </View>
             )
         
@@ -113,7 +113,7 @@ FC<{nav : any, skin: Skin, state: String}> =
                     <Text style={styles.nomSkin}>{skin.getSkinName()}</Text>
                     <Image
                         style={styles.imageSkin}
-                        source={skin.getSkinSource()}
+                        source={{uri: skin.getSkinSource()}}
                     />
                     <Text style={styles.nomSkin}>100€</Text>
                 </Pressable>
@@ -124,7 +124,7 @@ FC<{nav : any, skin: Skin, state: String}> =
                     <Text style={styles.nomSkin}>{skin.getSkinName()}</Text>
                     <Image
                         style={styles.imageSkin}
-                        source={skin.getSkinSource()}
+                        source={{uri: skin.getSkinSource()}}
                     />
                 </Pressable>
             )
@@ -134,7 +134,7 @@ FC<{nav : any, skin: Skin, state: String}> =
                     <Text style={styles.nomSkin}>{skin.getSkinName()}</Text>
                     <Image
                         style={styles.imageSkin}
-                        source={skin.getSkinSource()}
+                        source={{uri: skin.getSkinSource()}}
                     />
                 </Pressable>
             )
@@ -142,7 +142,7 @@ FC<{nav : any, skin: Skin, state: String}> =
             return(
                 <Image
                         style={styles.imageSkin}
-                        source={skin.getSkinSource()}
+                        source={{uri: skin.getSkinSource()}}
                 />
             )
     }

bob_party/src/constSkin.ts

@@ -1,13 +1,13 @@
 import { Skin } from "./core/skin";
 
 let tabSkinApp:Skin[]=[
-    new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0),
+    new Skin(1, "Bob","https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobClassic.png", 0),
-    new Skin("S0002", "Bob Blue",require('bob_party/assets/BobsSkins/BobBlue.png'), 100),
+    new Skin(2, "Bob Blue","https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobBlue.png", 100),
-    new Skin("S0003", "Bob BW",require('bob_party/assets/BobsSkins/BobBW.png'), 100),
+    new Skin(3, "Bob BW","https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobBW.png", 100),
-    new Skin("S0004", "Bob Green",require('bob_party/assets/BobsSkins/BobGreen.png'), 100),
+    new Skin(4, "Bob Green","https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobGreen.png", 100),
-    new Skin("S0005", "Bob P&T",require('bob_party/assets/BobsSkins/BobPinkTurquoise.png'), 100),
+    new Skin(5, "Bob P&T", "https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobPinkTurquoise.png", 100),
-    new Skin("S0006", "Bob Red",require('bob_party/assets/BobsSkins/BobRed.png'), 100),
+    new Skin(6, "Bob Red", "https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobRed.png", 100),
-    new Skin("S0007", "Bob Cute",require('bob_party/assets/BobsSkins/BobYellowGreenBlueHeart.png'), 100),
+    new Skin(7, "Bob Cute", "https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobYellowGreenBlueHeart.png", 100),
 ]
 
 

bob_party/src/core/Game.ts

@@ -3,15 +3,15 @@ import { ImageSourcePropType } from "react-native";
 import internal from "stream";
 
 export abstract class Game{
-    readonly id:string;
+    readonly id:number;
     private name:string;
-    private imageSource:ImageSourcePropType;
+    private imageSource:string;
     private gameSource:string;
     private nbPlayerMin: number;
     private nbPlayerMax:number;
 
     /* Constructor of the class */
-    constructor (id:string, name:string, imageSource:ImageSourcePropType, gameSource:string, nbPlayerMin:number, nbPlayerMax:number){
+    constructor (id:number, name:string, imageSource:string, gameSource:string, nbPlayerMin:number, nbPlayerMax:number){
         this.id=id;
         this.name=name;
         this.imageSource=imageSource;
@@ -41,7 +41,7 @@ export abstract class Game{
     }
 
     /* Brief : Function setting the image of a game */
-    setImageSource(imageSource:ImageSourcePropType){
+    setImageSource(imageSource:string){
         this.imageSource=imageSource;
     }
 

bob_party/src/core/Match/match.ts

@@ -1,17 +1,17 @@
 import { ImageSourcePropType } from 'react-native';
-import { Game } from './game';
+import { Game } from '../game';
-import { User } from "./User/user";
+import { User } from "../User/user";
 
 
 export abstract class Match{
-    readonly code:string;
+    readonly code:number;
-    private inGame:Boolean;
+    private inGame:Boolean=false;
     private tabUsers:User[];
     private theGame:Game;
 
-    constructor(code:string, inGame:Boolean, tabUser:User[], game:Game){
+    constructor(code:number, inGame:Boolean, tabUser:User[], game:Game){
         this.code=code;
-        this.inGame=false;
+        this.inGame=inGame;
         this.tabUsers=[...tabUser];
         this.theGame=game;
     }

bob_party/src/core/Match/matchCasino.ts

@@ -1,12 +1,12 @@
 import { Match } from "./match";
-import { User } from "./User/user";
+import { User } from "../User/user";
-import { Game } from "./game";
+import { Game } from "../game";
-import { GameCasino } from "./gameCasino";
+import { GameCasino } from "../gameCasino";
-import { ManagerCoinsUser } from "./User/userCoinsModifier";
+import { ManagerCoinsUser } from "../User/userCoinsModifier";
 
-export class MatchMulti extends Match{
+export default class MatchCasino extends Match{
 
-    constructor(code:string, inGame:Boolean, tabUser:User[], game:GameCasino){
+    constructor(code:number, inGame:Boolean, tabUser:User[], game:GameCasino){
         super(code, inGame, tabUser, game);
     }
 

bob_party/src/core/Match/matchCreator.ts

@@ -0,0 +1,12 @@
+import { MANAGER_MATCH } from "../../../App";
+import ManagerMatch from "../../services/matchServices/managerMatch";
+import { Game } from "../game";
+import { User } from "../User/user";
+import { Match } from "./match";
+
+export default class MatchCreator{
+
+    async createMatchSolo(u:User, g:Game): Promise<Match>{
+        return await MANAGER_MATCH.getsaverMatch().saveMatch(u, g);
+    }
+}

bob_party/src/core/Match/matchMulti.ts

@@ -0,0 +1,17 @@
+import { Match } from "./match";
+import { User } from "../User/user";
+import { Game } from "../game";
+import { GameMulti } from "../gameMulti";
+import { ManagerCoinsUser } from "../User/userCoinsModifier";
+
+export default class MatchMulti extends Match{
+
+    constructor(code:number, inGame:Boolean, tabUser:User[], game:GameMulti){
+        super(code, inGame, tabUser, game);
+    }
+
+    updatePostMatch(user:User, points: number): void {
+        const manage= new ManagerCoinsUser();
+        manage.addCoins(user, this.getGame().coinsCalculator(points));
+    }
+}

bob_party/src/core/Match/matchSolo.ts

@@ -0,0 +1,17 @@
+import { Match } from "./match";
+import { GameSolo } from "../gameSolo";
+import { User } from "../User/user";
+import { Game } from "../game";
+import { ManagerCoinsUser } from "../User/userCoinsModifier";
+
+export default class MatchSolo extends Match{
+
+    constructor(code:number, inGame:Boolean, tabUser:User[], game:GameSolo){
+        super(code, inGame, tabUser, game);
+    }
+
+    updatePostMatch(user:User, points: number): void {
+        const manage= new ManagerCoinsUser();
+        manage.addCoins(user, this.getGame().coinsCalculator(points));
+    }
+}

bob_party/src/core/User/user.ts

@@ -5,7 +5,7 @@ import { TextBase } from 'react-native';
 
 export class User{
 
-    readonly id: string;
+    readonly id: number;
     private username: string;
     private password: string;
     private nationality: string;
@@ -18,7 +18,7 @@ export class User{
     private tabSkin: Skin[];
 
     /* Consturctor of the class */
-    constructor(id: string, username: string, password:string, nationality: string, sexe: string, dateOfBirth: Date, currentCoins: number, totalCoins: number,
+    constructor(id: number, username: string, password:string, nationality: string, sexe: string, dateOfBirth: Date, currentCoins: number, totalCoins: number,
                 nbGamesPlayed:number, currentSkin: Skin, tabSkin: Skin[]){
                     this.id=id;
                     this.username=username;

bob_party/src/core/User/userCreator.ts

@@ -8,21 +8,7 @@ export class UserCreator{
 
     async createUser(username:string, password:string, nationality:string, sexe:string, date:Date){
         //Récup l'ID d'après dans la bdd
-        let u:User;
+        let u:null|User = await MANAGER_USER.getsaverUser().saveUser(username, password, nationality, sexe, date);
-        let newId:string="";
-
-        let oldId = await MANAGER_USER.getLoaderUser().loadLastId();
-        oldId=oldId.slice(1);
-        let leInt=parseInt(oldId);
-        newId+="U";
-        for (let i = 0; i < 4-leInt.toString().length; i++) {
-            newId = newId + "0";
-        }
-        leInt+=1;
-        newId=newId+leInt;
-        console.log(newId);
-        u = new User(newId, username, password, nationality, sexe, date, 0, 0, 0, tabSkinApp[0], [tabSkinApp[0]]); 
-        await MANAGER_USER.getsaverUser().saveUser(u);
         MANAGER_USER.setCurrentUser(u);      
         return u;
     }

bob_party/src/core/conversation.ts

@@ -3,14 +3,14 @@ import { User } from "./User/user";
 
 
 export class Conversation{
-    private Id: string;
+    private id: number;
     private tabUser: User[];
     private tabMessage: Message[];
     private name: string;
     
     /* Constructor of the class */
-    constructor(id: string, tabUser: User[], tabMessage:Message[], name:string){
+    constructor(id: number, tabUser: User[], tabMessage:Message[], name:string){
-        this.Id=id;
+        this.id=id;
         this.tabUser=[...tabUser];
         this.tabMessage=[...tabMessage];
         this.name=name;
@@ -40,7 +40,7 @@ export class Conversation{
 
     /* Brief : function returning the id of a conversation */
     getId(){
-        return this.Id;
+        return this.id;
     }
 
     /* Brief : function returning the name to a conversation */

bob_party/src/core/gameCasino.ts

@@ -3,7 +3,7 @@ import { Game } from './game'
 
 export class GameCasino extends Game{
 
-    constructor(id:string, name:string, imageSource:ImageSourcePropType, gameSource:string, nbPlayerMin:number, nbPlayerMax:number){
+    constructor(id:number, name:string, imageSource:string, gameSource:string, nbPlayerMin:number, nbPlayerMax:number){
         super(id, name, imageSource, gameSource, nbPlayerMin, nbPlayerMax);
     }
 

bob_party/src/core/gameMulti.ts

@@ -4,7 +4,7 @@ import { Game } from './game'
 export class GameMulti extends Game{
     readonly rankToCoins:Map<number,number>
 
-    constructor(id:string, name:string, imageSource:ImageSourcePropType, gameSource:string, nbPlayerMin:number, nbPlayerMax:number, rankToCoins:Map<number,number>){
+    constructor(id:number, name:string, imageSource:string, gameSource:string, nbPlayerMin:number, nbPlayerMax:number, rankToCoins:Map<number,number>){
         super(id, name, imageSource, gameSource, nbPlayerMin, nbPlayerMax);
         this.rankToCoins=rankToCoins;
     }

bob_party/src/core/gameSolo.ts

@@ -4,7 +4,7 @@ import { Game } from './game'
 export class GameSolo extends Game{
     readonly ptsToCoins:Map<number,number>
 
-    constructor(id:string, name:string, imageSource:ImageSourcePropType, gameSource:string, nbPlayerMin:number, nbPlayerMax:number, ptsToCoins:Map<number,number>){
+    constructor(id:number, name:string, imageSource:string, gameSource:string, nbPlayerMin:number, nbPlayerMax:number, ptsToCoins:Map<number,number>){
         super(id, name, imageSource, gameSource, nbPlayerMin,nbPlayerMax);
         this.ptsToCoins=ptsToCoins;
     }

bob_party/src/core/matchMulti.ts

@@ -1,17 +0,0 @@
-import { Match } from "./match";
-import { User } from "./User/user";
-import { Game } from "./game";
-import { GameMulti } from "./gameMulti";
-import { ManagerCoinsUser } from "./User/userCoinsModifier";
-
-export class MatchMulti extends Match{
-
-    constructor(code:string, inGame:Boolean, tabUser:User[], game:GameMulti){
-        super(code, inGame, tabUser, game);
-    }
-
-    updatePostMatch(user:User, points: number): void {
-        const manage= new ManagerCoinsUser();
-        manage.addCoins(user, this.getGame().coinsCalculator(points));
-    }
-}

bob_party/src/core/matchSolo.ts

@@ -1,17 +0,0 @@
-import { Match } from "./match";
-import { GameSolo } from "./gameSolo";
-import { User } from "./User/user";
-import { Game } from "./game";
-import { ManagerCoinsUser } from "./User/userCoinsModifier";
-
-export class MatchSolo extends Match{
-
-    constructor(code:string, inGame:Boolean, tabUser:User[], game:GameSolo){
-        super(code, inGame, tabUser, game);
-    }
-
-    updatePostMatch(user:User, points: number): void {
-        const manage= new ManagerCoinsUser();
-        manage.addCoins(user, this.getGame().coinsCalculator(points));
-    }
-}

bob_party/src/core/message.ts

@@ -2,52 +2,52 @@ import { User } from './User/user'
 
 
 export class Message{
-    private Id: string;
+    private id: number;
-    private Content: string;
+    private content: string;
-    private Sender: User;
+    private sender: User;
-    private DateEnvoie: Date;
+    private dateEnvoie: Date;
 
     /* Constructor of the class */
-    constructor(id: string, content: string, sender:User, dateEnvoie:Date){
+    constructor(id: number, content: string, sender:User, dateEnvoie:Date){
-        this.Id=id;
+        this.id=id;
-        this.Content=content;
+        this.content=content;
-        this.Sender=sender;
+        this.sender=sender;
-        this.DateEnvoie=dateEnvoie;
+        this.dateEnvoie=dateEnvoie;
     }
     
     /* Brief : Function setting the content of a message */
     setMessageContent(content: string){
-        this.Content=content;
+        this.content=content;
     }
 
     /* Brief : Function setting the sender of a message */
     setMessageSender(sender: User){
-        this.Sender=sender;
+        this.sender=sender;
     }
 
     /* Brief : Function setting the date of a message */
     setMessageDate(dateEnvoie: Date){
-        this.DateEnvoie=dateEnvoie;
+        this.dateEnvoie=dateEnvoie;
     }
 
     /* Brief : Function getting the id of a message */
     getMessageId(){
-        return this.Id;
+        return this.id;
     }
 
     /* Brief : Function getting the content of a message */
     getMessageContent(){
-        return this.Content;
+        return this.content;
     }
 
     /* Brief : Function getting the sender of a message */
     getMessageSender(){
-        return this.Sender;
+        return this.sender;
     }
 
     /* Brief : Function getting the date of a message */
     getMessageDate(){
-        return this.DateEnvoie;
+        return this.dateEnvoie;
     }
 
 

bob_party/src/core/skin.ts

@@ -1,13 +1,13 @@
 import { ImageSourcePropType } from "react-native";
 
 export class Skin{
-    readonly id: string;
+    readonly id: number;
     private name: string;
-    private source: ImageSourcePropType;
+    private source: string;
     private cost:number;
 
     /* Constructor of the class */
-    constructor(id:string, name: string, source:ImageSourcePropType, Cost:number){
+    constructor(id:number, name: string, source:string, Cost:number){
         this.id=id;
         this.name=name;
         this.source=source;
@@ -20,7 +20,7 @@ export class Skin{
     }
 
     /* Brief : Fuction setting the source of the image of a skin */
-    setSkinSource(source: ImageSourcePropType){
+    setSkinSource(source: string){
         this.source=source;
     }
 

bob_party/src/core/tests/conversation.test.ts

@@ -8,20 +8,20 @@ import { User } from '../User/user';
 // Instances
 let conv:Conversation[] = [];
 let tab:Skin[] = [];
-let classique = new Skin("S0001", "Bob", require('bob_party/assets/BobsSkins/BobClassic.png'), 0);
+new Skin(1, "Bob","https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobClassic.png", 0);
 let dateBirth = new Date(2010,0o3,0o7);
-let usr = new User('00001', 'Killyan', 'password', 'France', 'M', dateBirth, 0, 0, 0, classique, tab);
+let usr = new User(1, 'Killyan', 'password', 'France', 'M', dateBirth, 0, 0, 0, classique, tab);
-let usr2 = new User('00002', 'Karina', '1234', 'France', 'F', dateBirth, 5, 6, 8, classique, tab);
+let usr2 = new User(2, 'Karina', '1234', 'France', 'F', dateBirth, 5, 6, 8, classique, tab);
 let theDate = new Date(2022,10,14);
 let theDate2 = new Date(2022,10,13);
 let theDate3 = new Date(2022,10,15);
-let mess = new Message('M0001', 'Bob Party est le meilleur projet', usr, theDate2);
+let mess = new Message(1, 'Bob Party est le meilleur projet', usr, theDate2);
 let tabU:User[] = [usr, usr2];
-let mess2 = new Message('M0002', 'Oui tout à fait', usr2, theDate);
+let mess2 = new Message(2, 'Oui tout à fait', usr2, theDate);
-let mess3 = new Message('M0003', 'Mais oui trop de ouf', usr, theDate3);
+let mess3 = new Message(3, 'Mais oui trop de ouf', usr, theDate3);
 let tabM:Message[] = [mess, mess2];
-let convo = new Conversation('C0001', tabU, tabM, 'the conv');
+let convo = new Conversation(1, tabU, tabM, 'the conv');
-let usr3 = new User('00003', 'wow', 'password', 'France', 'M', dateBirth, 0, 0, 0, classique, tab);
+let usr3 = new User(4, 'wow', 'password', 'France', 'M', dateBirth, 0, 0, 0, classique, tab);
 
 
 // Get tests

bob_party/src/core/tests/matchSolo.test.ts

@@ -1,4 +1,4 @@
-import { MatchSolo } from '../MatchSolo';
+import { MatchSolo } from '../Match/matchSolo';
 import { Conversation } from '../Conversation';
 import { Skin } from '../Skin';
 import { User } from '../User/user';

bob_party/src/navigation/AppNavigator.tsx

@@ -12,7 +12,7 @@ import SkinList from '../screens/SkinList'
 import GameChoice from '../screens/GameChoice'
 import SignIn from '../screens/SignIn'
 import SignUp from '../screens/SignUp'
-
+import CookieClicker from '../Games/CookieClicker/CookieClicker'
 
 
 const HomeStack = createStackNavigator();
@@ -25,7 +25,7 @@ function HomeStackScreen() {
     <HomeStack.Navigator screenOptions={{ headerShown: false}}>
       <HomeStack.Screen name="Home" component={Home} options={{animationEnabled: false,}}/>
       <HomeStack.Screen name="Settings" component={Settings} />
-      <HomeStack.Screen name='GameChoice' component={GameChoice} options={{animationEnabled: false,}}/>
+      <HomeStack.Screen name="GameChoice" component={GameChoice} options={{animationEnabled: false,}}/>
     </HomeStack.Navigator>
   );
 }

bob_party/src/screens/GameChoice.tsx

@@ -16,7 +16,7 @@ let tabConv:Conversation[]=[];
 const msc = require('../../assets/Icons/FondGris.png');
 
 //const UserActu=new User("14", "leBg", "MdpDeOuf", "ouioui", "grand",  new Date(2022,12,12), 12222, 123324, 12, tabSkinApp[0], tabSkinApp, tabConv);
-const cookieClicker= new GameSolo("1", "Cookie Clicker", require('../../assets/Icons/UnSelected/Gamepad.png'), "/Games/CookieClicker/cookieClicker.tsx", 1, 1, new Map<number,number>);
+const cookieClicker= new GameSolo(1, "Cookie Clicker", "https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobYellowGreenBlueHeart.png", "/Games/CookieClicker/cookieClicker.tsx", 1, 1, new Map<number,number>);
 function GameChoice(props: { navigation: any; }) {
     const { navigation } = props
     return (

bob_party/src/services/conversationService/loaderConversationApi.ts

@@ -26,11 +26,12 @@ export class LoaderConversationApi implements ILoaderConversation{
               }
          })
          .then(function (response: any) {
-            tabConv=[new Conversation("C0001", 
+            let skin= new Skin(1, "Bob","https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobClassic.png", 0);
-            [new User("U0001", "Alban", "oui", "ouioui", "homme", new Date(2022,12,12), 555, 667, 12, new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0), [new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0)]),
+            tabConv=[new Conversation(1, 
-            new User("U0002", "Fefe63", "jesuishm", "ouioui", "homme", new Date(2022,12,12), 12222, 123324, 12, new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0), [new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0)]),],
+            [new User(1, "Alban", "oui", "ouioui", "homme", new Date(2022,12,12), 555, 667, 12, skin, [skin]),
-            [new Message("M0001", "bonjour", new User("U0001", "Alban", "oui", "ouioui", "homme", new Date(2022,12,12), 555, 667, 12, new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0), [new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0)]), new Date(2022,12,12)),
+            new User(3, "Fefe63", "jesuishm", "ouioui", "homme", new Date(2022,12,12), 12222, 123324, 12, skin, [skin])],
-            new Message("M0002", "test", new User("U0002", "Fefe63", "oui", "ouioui", "homme", new Date(2022,12,12), 555, 667, 12, new Skin("S0002", "Bob Blue",require('bob_party/assets/BobsSkins/BobBlue.png'), 100), [new Skin("S0002", "Bob Blue",require('bob_party/assets/BobsSkins/BobBlue.png'), 100)]), new Date(2022,12,13))], "leNom")];
+            [new Message(1, "bonjour", new User(1, "Alban", "oui", "ouioui", "homme", new Date(2022,12,12), 555, 667, 12, skin, [skin]), new Date(2022,12,12)),
+            new Message(2, "test", new User(2, "Fefe63", "oui", "ouioui", "homme", new Date(2022,12,12), 555, 667, 12, skin, [skin]), new Date(2022,12,13))], "leNom")];
         });
         return tabConv;
     }

bob_party/src/services/matchServices/ILoaderMatch.ts

@@ -1,4 +1,4 @@
-import { Match } from "../../core/match";
+import { Match } from "../../core/Match/match";
 
 export default interface ILoaderMatch{
 

bob_party/src/services/matchServices/ISaverMatch.ts

@@ -1,4 +1,6 @@
-import { Match } from "../../core/match";
+import { Game } from "../../core/game";
+import { Match } from "../../core/Match/match";
+import { User } from "../../core/User/user";
 
 export default interface ISaverMatch{
 
@@ -7,7 +9,7 @@ export default interface ISaverMatch{
      * m the Match we want to save
      */
 
-    saveMatch(m:Match): Promise<void>;
+    saveMatch(u:User, g:Game): Promise<Match>;
 
     /**
      * deleteMatch methode that delete a Match in the data management system

bob_party/src/services/matchServices/loaderMatchApi.ts

@@ -0,0 +1,13 @@
+import { Match } from "../../core/Match/match";
+import ILoaderMatch from "./ILoaderMatch";
+
+export default class LoaderMatchApi implements ILoaderMatch{
+    
+    async loadAllMatch(): Promise<Match[]> {
+        throw new Error("Method not implemented.");
+    }
+    async loadByID(id: string): Promise<Match | null> {
+        throw new Error("Method not implemented.");
+    }
+
+}

bob_party/src/services/matchServices/managerMatch.ts

@@ -0,0 +1,41 @@
+import { Match } from "../../core/Match/Match";
+import ILoaderMatch from "./ILoaderMatch";
+import ISaverMatch from "./ISaverMatch";
+
+export default class ManagerMatch{
+
+    private currentMatch: Match | null=null;
+
+    private loaderMatch: ILoaderMatch;
+
+    private saverMatch: ISaverMatch;
+
+    constructor(loader:ILoaderMatch, saver:ISaverMatch){
+        this.loaderMatch=loader;
+        this.saverMatch=saver;
+    }
+
+    getCurrentMatch(){
+        return this.currentMatch;
+    }
+
+    setCurrentMatch(u:Match | null){
+        this.currentMatch=u;
+    }
+
+    getLoaderMatch(){
+        return this.loaderMatch;
+    }
+
+    setLoaderMatch(l:ILoaderMatch){
+        this.loaderMatch=l;
+    }
+
+    getsaverMatch(){
+        return this.saverMatch;
+    }
+
+    setsaverMatch(s:ISaverMatch){
+        this.saverMatch=s;
+    }
+}

bob_party/src/services/matchServices/saverMatchApi.ts

@@ -0,0 +1,32 @@
+import { Game } from "../../core/game";
+import { Match } from "../../core/Match/match";
+
+import { User } from "../../core/User/user";
+import ISaverMatch from "./ISaverMatch";
+import { GameSolo } from "../../core/gameSolo";
+import { GameMulti } from "../../core/gameMulti";
+import MatchSolo from "../../core/Match/matchSolo";
+import MatchMulti from "../../core/Match/matchMulti";
+import MatchCasino from "../../core/Match/matchCasino";
+
+export default class SaverMatchApi implements ISaverMatch{
+
+    async saveMatch(u:User, g:Game): Promise<Match> {
+        //match = mettre dans bdd
+        if (g instanceof GameSolo){
+            return new MatchSolo(12, false, [u], g);
+        }
+        else if(g instanceof GameMulti){
+            return new MatchMulti(12, false, [u], g);
+        }
+        return new MatchCasino(12, false, [u], g);
+        
+    }
+    async deleteMatch(m: Match): Promise<void> {
+        throw new Error("Method not implemented.");
+    }
+    async updateMatch(m: Match): Promise<void> {
+        throw new Error("Method not implemented.");
+    }
+
+}

bob_party/src/services/userServices/ILoaderUser.ts

@@ -1,5 +1,5 @@
 import { Conversation } from "../../core/conversation";
-import { Match } from "../../core/match";
+import { Match } from "../../core/Match/match";
 import { User } from "../../core/User/user";
 
 export default interface ILoaderUser{
@@ -15,7 +15,7 @@ export default interface ILoaderUser{
      * id the id we want to search
      * return a User if found, if not null
      */
-    loadByID(id:string): Promise<User | null>;
+    loadByID(id:number): Promise<User | null>;
 
     /**
      * loadByUsername methode that load a user from the data management system by his username
@@ -48,5 +48,5 @@ export default interface ILoaderUser{
      * loadLastId methode that load the last id used to create a user
      * return a String
      */
-    loadLastId(): Promise<string>;
+    loadLastId(): Promise<number>;
 }

bob_party/src/services/userServices/ISaverUser.ts

@@ -7,7 +7,7 @@ export default interface ISaverUser{
      * u the user we want to save
      */
 
-    saveUser(u:User | null): Promise<void>;
+    saveUser(username:string, password:string, nationality:string, sexe:string, date:Date): Promise<User | null>;
 
      /**
       * deleteUser methode that delete a User in the data management system

bob_party/src/services/userServices/fakeSaverUser.ts

@@ -4,8 +4,8 @@ import ISaverUser from "./ISaverUser";
 
 export default class FakeSaverUser implements ISaverUser{
     
-    async saveUser(u: User): Promise<void> {
+    async saveUser(username:string, password:string, nationality:string, sexe:string, date:Date): Promise<User | null> {
-        return;
+        return null;
     }
     async deleteUser(u: User): Promise<void> {
         return;

bob_party/src/services/userServices/loaderUserApi.ts

@@ -1,6 +1,6 @@
 import tabSkinApp from "../../constSkin";
 import { Conversation } from "../../core/conversation";
-import { Match } from "../../core/match";
+import { Match } from "../../core/Match/match";
 import { Skin } from "../../core/skin";
 import { User } from "../../core/User/user";
 import ILoaderUser from "./ILoaderUser";
@@ -37,14 +37,14 @@ export default class LoaderUserApi implements ILoaderUser{
          .then(function (response: any) {
             if (response.data != null && response.data != undefined){
                 Object.assign(test, response.data);
-                us.push(new User("17", "Fefe63", "jesuishm", "ouioui", "homme", new Date(2022,12,12), 12222, 123324, 12, tabSkinApp[6], tabSkinApp));
+                us.push(new User(1, "Fefe63", "jesuishm", "ouioui", "homme", new Date(2022,12,12), 12222, 123324, 12, tabSkinApp[6], tabSkinApp));
             }
         });
     return us;
     }
 
     
-    async loadByID(id: string): Promise<User | null> {
+    async loadByID(id: number): Promise<User | null> {
         let test = new Test(true, 0, "wesh", 0);
         try{
             await this.axios({
@@ -64,7 +64,7 @@ export default class LoaderUserApi implements ILoaderUser{
         }catch (error) {
             console.error(error);
         }
-        return new User("17", "Bite", "jesuishm", "ouioui", "homme", new Date(2022,12,12), 123, 123324, 12, tabSkinApp[6], tabSkinApp);
+        return new User(1, "Bite", "jesuishm", "ouioui", "homme", new Date(2022,12,12), 123, 123324, 12, tabSkinApp[6], tabSkinApp);
     }
 
 
@@ -102,8 +102,9 @@ export default class LoaderUserApi implements ILoaderUser{
               }
          })
          .then(function (response: any) {
-            const tabTest=[new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0),     new Skin("S0002", "Bob Blue",require('bob_party/assets/BobsSkins/BobBlue.png'), 100)];
+            const tabTest=[new Skin(1, "Bob","https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobClassic.png", 0),
-            user=new User("U0001", username, password, "ouioui", "homme", new Date(2022,12,12), 200, 123324, 12, new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0), tabTest);
+            new Skin(2, "Bob Blue","https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobBlue.png", 100)];
+            user=new User(1, username, password, "ouioui", "homme", new Date(2022,12,12), 200, 123324, 12, new Skin(1, "Bob","https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobClassic.png", 0), tabTest);
         });
         return user;
     }
@@ -118,7 +119,7 @@ export default class LoaderUserApi implements ILoaderUser{
     }
 
 
-    async loadLastId(): Promise<string> {
+    async loadLastId(): Promise<number> {
         let test = new Test(true, 0, "wesh", 0);
         try {
             const response = await this.axios.get('https://jsonplaceholder.typicode.com/todos/1');
@@ -126,7 +127,7 @@ export default class LoaderUserApi implements ILoaderUser{
           } catch (error) {
             console.error(error);
           }
-          return "U0001";
+          return 1;
     }
 
 

bob_party/src/services/userServices/saverUserApi.ts

@@ -6,7 +6,8 @@ export default class SaverUserApi implements ISaverUser{
 
     private axios = require('axios').default;
 
-    async saveUser(u: User): Promise<void> {
+    async saveUser(username:string, password:string, nationality:string, sexe:string, date:Date): Promise<User | null> {
+        let us:User|null=null;
         this.axios({
             method: 'post',
             url: '/user/12345',
@@ -14,8 +15,14 @@ export default class SaverUserApi implements ISaverUser{
               firstName: 'Fred',
               lastName: 'Flintstone'
             }
-          });
+          }).then(function (response: any) {
-        
+            if (response.data != null && response.data != undefined){
+                let test:any;
+                Object.assign(test, response.data);
+                us=test;
+            }
+        });
+        return us;
     }
     async deleteUser(u: User): Promise<void> {
         throw new Error("Method not implemented.");

bob_party/src/services/userServices/stub.ts

@@ -1,22 +1,23 @@
 import { Conversation } from "../../core/conversation";
-import { Match } from "../../core/match";
+import { Match } from "../../core/Match/match";
 import { Skin } from "../../core/skin";
 import { User } from "../../core/User/user";
 import ILoaderUser from "./ILoaderUser";
 
 export default class StubUser implements ILoaderUser{
 
+    skin:Skin=new Skin(1, "Bob","https://codefirst.iut.uca.fr/git/BOB_PARTEAM/BOB_PARTY/raw/branch/typescript/bob_party/assets/BobsSkins/BobClassic.png", 0);
+
+
     tabUS:User[]=[
-        new User("14", "leBg", "MdpDeOuf", "ouioui", "grand", new Date(2022,12,12), 12222, 123324, 12, new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0), [new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0)]),
+        new User(1, "leBg", "MdpDeOuf", "ouioui", "grand", new Date(2022,12,12), 12222, 123324, 12, this.skin, [this.skin]),
-        new User("48", "WeshWesh", "MdpDeOuf", "ouioui", "grand", new Date(2022,12,12), 12222, 123324, 12, new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0), [new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0)]),
+        new User(2, "WeshWesh", "MdpDeOuf", "ouioui", "grand", new Date(2022,12,12), 12222, 123324, 12, this.skin, [this.skin]),
-        new User("17", "Alban", "oui", "ouioui", "homme", new Date(2022,12,12), 555, 667, 12, new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0), [new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0)],),
-        new User("17", "Fefe63", "jesuishm", "ouioui", "homme", new Date(2022,12,12), 12222, 123324, 12, new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0), [new Skin("S0001", "Bob",require('bob_party/assets/BobsSkins/BobClassic.png'), 0)]),
     ];
 
     async loadAllUser(): Promise<User[]> {
         return this.tabUS;
     }
-    async loadByID(id: string): Promise<User | null> {
+    async loadByID(id: number): Promise<User | null> {
         for(let u of this.tabUS){
             if (u.getId()==id){
                 return u;
@@ -57,7 +58,7 @@ export default class StubUser implements ILoaderUser{
         return tabUser;
     }
 
-    async loadLastId(): Promise<string> {
+    async loadLastId(): Promise<number> {
         throw new Error("Method not implemented.");
     }