From 17b2aab4fadf414aaa5771b68fea21ae0b285ab7 Mon Sep 17 00:00:00 2001
From: Zsolt Tasnadi <rastasi@gmail.com>
Date: Wed, 28 Jun 2023 15:41:06 +0200
Subject: [PATCH] remove controller layer

---
 Makefile                 |  6 ++++++
 controller/controller.go | 11 -----------
 domain/context.go        | 17 +++++++++++++----
 domain/domain.go         | 10 ++--------
 domain/screen.go         |  1 -
 main.go                  | 14 ++++----------
 6 files changed, 25 insertions(+), 34 deletions(-)
 create mode 100644 Makefile
 delete mode 100644 controller/controller.go

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..ec65f7c
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,6 @@
+dev:
+	go run main.go
+build:
+	echo "install"
+install:
+	echo "install"
diff --git a/controller/controller.go b/controller/controller.go
deleted file mode 100644
index 3f346d7..0000000
--- a/controller/controller.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package controller
-
-import "game/domain"
-
-type Controller struct {
-	Context domain.Context
-}
-
-func (c Controller) Init() {
-
-}
diff --git a/domain/context.go b/domain/context.go
index 30362ba..3808c13 100644
--- a/domain/context.go
+++ b/domain/context.go
@@ -13,12 +13,21 @@ type GameField struct {
 	LevelSection LevelSection
 }
 
+type Position struct {
+	X int
+	Y int
+}
+
 type Context struct {
-	Player    Player
-	User      User
-	GameField GameField
+	Player           Player
+	User             User
+	CurrentGameField GameField
+	CurrentPosition  Position
 }
 
 func CreateContext() Context {
-	return Context{}
+	return Context{
+		Player: Player{},
+		User:   User{},
+	}
 }
diff --git a/domain/domain.go b/domain/domain.go
index 2c65b25..0a1762c 100644
--- a/domain/domain.go
+++ b/domain/domain.go
@@ -1,21 +1,15 @@
 package domain
 
-type ControllerInterface interface {
-	Init()
-}
-
 type PresenterInterface interface {
 	Init()
 }
 
 type Domain struct {
-	Context    Context
-	Controller ControllerInterface
-	Presenter  PresenterInterface
+	Context   Context
+	Presenter PresenterInterface
 }
 
 func (d Domain) Init() {
-	d.Controller.Init()
 	d.Presenter.Init()
 	menu_manager := MenuManager{}
 	menu_manager.Init()
diff --git a/domain/screen.go b/domain/screen.go
index 3b289a9..b7f68b0 100644
--- a/domain/screen.go
+++ b/domain/screen.go
@@ -1,7 +1,6 @@
 package domain
 
 type Screen struct {
-	Controller ControllerInterface
 }
 
 type ScreenManager struct {
diff --git a/main.go b/main.go
index 6f5d210..7e13084 100644
--- a/main.go
+++ b/main.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"game/controller"
 	"game/domain"
 	"game/presenter"
 )
@@ -9,16 +8,11 @@ import (
 func main() {
 	context := domain.CreateContext()
 
-	controller := controller.Controller{
-		Context: context,
-	}
-	presenter := presenter.Presenter{
-		Context: context,
-	}
 	domain := domain.Domain{
-		Context:    context,
-		Controller: controller,
-		Presenter:  presenter,
+		Context: context,
+		Presenter: presenter.Presenter{
+			Context: context,
+		},
 	}
 	domain.Init()
 }