From f7d55d7ed0e183ccd323652945ffdff7da6f99e3 Mon Sep 17 00:00:00 2001
From: Samuli Virtapohja <l4721@student.jamk.fi>
Date: Mon, 17 Jun 2019 09:09:36 +0300
Subject: [PATCH] waiting

---
 src/app.controller.ts    | 12 ------------
 src/user/user.service.ts | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 12 deletions(-)
 delete mode 100644 src/app.controller.ts

diff --git a/src/app.controller.ts b/src/app.controller.ts
deleted file mode 100644
index cce879e..0000000
--- a/src/app.controller.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Controller, Get } from '@nestjs/common';
-import { AppService } from './app.service';
-
-@Controller()
-export class AppController {
-  constructor(private readonly appService: AppService) {}
-
-  @Get()
-  getHello(): string {
-    return this.appService.getHello();
-  }
-}
diff --git a/src/user/user.service.ts b/src/user/user.service.ts
index 4833b7e..840d832 100644
--- a/src/user/user.service.ts
+++ b/src/user/user.service.ts
@@ -36,4 +36,25 @@ export class UserService {
         }
     }
 
+    // liitytään peliin
+    async joinGame(game: GameDTO, data: UserDTO){
+        try {
+            // etsi peli valinnan mukaan ja otetaan käyttäjän rooli kyseisestä pelistä talteen
+            const role = await this.gameRepository.findOne();
+            return gamedata;
+        } catch (error) {
+            return error.message;
+        }
+    }
+
+    // liitytään factionii
+    async joinFaction(): Promise<boolean>{
+        try {
+            // tarkistetaan factionin salasana
+            return true;
+        } catch (error) {
+            return error;
+        }
+    }
+
 }
-- 
GitLab