Release/step2

.gitignore

@@ -28,3 +28,4 @@ HELP.md
 
 ### VS Code ###
 .vscode/
+gradle/wrapper/gradle-wrapper.properties

build.gradle

@@ -25,6 +25,7 @@ dependencies {
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     runtimeOnly 'org.springframework.boot:spring-boot-devtools'
     annotationProcessor 'org.projectlombok:lombok'
+
     // webjars
     implementation 'org.webjars:webjars-locator:0.36'
     implementation 'org.webjars:jquery:3.4.0'
@@ -39,5 +40,4 @@ dependencies {
     compile group: 'com.google.zxing', name: 'core', version: '3.3.0'
     // https://mvnrepository.com/artifact/com.google.zxing/javase
     compile group: 'com.google.zxing', name: 'javase', version: '3.3.0'
-
 }

src/main/java/io/github/wotjd243/findbyhint/hint/application/HintService.java

@@ -0,0 +1,11 @@
+package io.github.wotjd243.findbyhint.hint.application;
+
+import org.springframework.stereotype.Service;
+
+//TODO 1. TargetPoint 생성시점
+//TODO 2. Hint Entity에서 쌓인 좌표들을 Delete 해준다
+
+@Service
+public class HintService {
+
+}

src/main/java/io/github/wotjd243/findbyhint/hunter/domain/Hunter.java

@@ -2,10 +2,6 @@
 
 public class Hunter {
 
-    // TODO (1)‘헌터’는 하루에 미션 하나를 풀 수 있고 기회는 3번이다.
-    // TODO (2)‘헌터' 는 미션 포인트를 100점 모으면 문제를 풀 수 있는 총알을 하나 얻는다.
-    // TODO (3)‘헌터' 가 미션을 풀 수있는 기회의 수는 총알이다. 관련된 객체 생성하기.
-
     private final HunterId hunterId;
 
     private final HunterPw hunterPw;
@@ -18,13 +14,50 @@ public class Hunter {
 
     private final HunterPoint hunterPoint;
 
-    Hunter(String hunterId, String hunterPw, String hunterName, String hunterPicturePath, String hunterPictureName, int hunterPoint) {
+    private int hunterBullet;
+
+    public Hunter(String hunterId, String hunterPw, String hunterName, String hunterPicturePath, String hunterPictureName, int hunterPoint, int hunterBullet) {
         this.hunterId = new HunterId(hunterId);
         this.hunterPw = new HunterPw(hunterPw);
         this.hunterName = new HunterName(hunterName);
         this.hunterPicturePath = hunterPicturePath;
         this.hunterPictureName = new HunterPictureName(hunterPictureName);
         this.hunterPoint = new HunterPoint(hunterPoint);
+        this.hunterBullet = hunterBullet;
+    }
+
+    public void decreaseOneBullet() {
+
+        int aa;
+
+        if (hunterBullet < 1) {
+            throw new IllegalStateException();
+        }
+        hunterBullet--;
+    }
+
+    public void increaseOneBullet() {
+        if (hunterBullet >= 3) {
+            log.println("이미 총알이 3개입니다.");
+            throw new IllegalStateException();
+        }
+        hunterBullet++;
+    }
+
+    public void buyOneBullet() {
+
+        log.println("before_hunterPoint : " + hunterPoint.getHunterPoint());
+        log.println("before_hunterBullet : " + hunterBullet);
+
+        if (hunterPoint.bulletBuyPointCheck()) {
+            hunterPoint.hunterPointMinus(100);
+            increaseOneBullet();
+        } else {
+            log.println("포인트가 부족합니다.");
+            throw new IllegalStateException();
+        }
+        log.println("after_hunterPoint : " + hunterPoint.getHunterPoint());
+        log.println("after_hunterBullet : " + hunterBullet);
     }
 
 }

src/main/java/io/github/wotjd243/findbyhint/hunter/domain/HunterBullet.java

@@ -0,0 +1,12 @@
+package io.github.wotjd243.findbyhint.hunter.domain;
+
+public class HunterBullet {
+
+    private int hunterBullet;
+
+    public HunterBullet(int hunterBullet) {
+
+        this.hunterBullet = hunterBullet;
+
+    }
+}

src/main/java/io/github/wotjd243/findbyhint/hunter/domain/HunterPoint.java

@@ -15,10 +15,29 @@ public HunterPoint(int hunterPoint) {
     }
 
     private void validation(int hunterPoint) {
+        Check.numberLimit(hunterPoint, 99999);
+    }
 
-        Check.numberLimit(hunterPoint,99999);
+    public boolean bulletBuyPointCheck() {
+        if (hunterPoint > 100) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 
+    public HunterPoint hunterPointMinus(int minus) {
+        hunterPoint = hunterPoint - minus;
+        return new HunterPoint(hunterPoint);
     }
 
 
+    public HunterPoint hunterPointPlus(int plus) {
+        hunterPoint = hunterPoint + plus;
+        return new HunterPoint(hunterPoint);
+    }
+
+    public int getHunterPoint() {
+        return hunterPoint;
+    }
 }

src/main/java/io/github/wotjd243/findbyhint/hunter/ui/HunterController.java

@@ -0,0 +1,28 @@
+package io.github.wotjd243.findbyhint.hunter.ui;
+
+import io.github.wotjd243.findbyhint.hunter.domain.Hunter;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@Controller
+public class HunterController {
+
+    @GetMapping("/login")
+    public String naverLogin(Model model) {
+
+        return "/login";
+    }
+
+    @PostMapping("/buyOneBullet")
+    public String buyOneBullet(Hunter hunter) {
+        hunter.buyOneBullet();
+
+        // 추후 화면 개발 후 변경
+        return "redirect:/login";
+    }
+
+
+
+}

src/main/java/io/github/wotjd243/findbyhint/mission/domain/MissionRepository.java

@@ -7,6 +7,4 @@
 @Repository
 public interface MissionRepository {
     Optional<Mission> findById(final MissionLevel level);
-
-//    Optional<Mission> findByLevel(final String level);
 }

src/main/java/io/github/wotjd243/findbyhint/mission/ui/MissionController.java

@@ -0,0 +1,13 @@
+package io.github.wotjd243.findbyhint.mission.ui;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class MissionController {
+
+    @GetMapping("/")
+    public void index() {
+
+    }
+}

src/main/java/io/github/wotjd243/findbyhint/mission/ui/MissionRestController.java

@@ -0,0 +1,4 @@
+package io.github.wotjd243.findbyhint.mission.ui;
+
+public class MissionRestController {
+}

src/main/java/io/github/wotjd243/findbyhint/treasure/domain/RunningTime.java

@@ -1,7 +1,5 @@
 package io.github.wotjd243.findbyhint.treasure.domain;
 
-
-
 import io.github.wotjd243.findbyhint.util.check.DateObject;
 
 import java.time.LocalDate;

src/main/resources/application.properties

@@ -1 +1,31 @@
+server.port=8080
+spring.profiles.active=local
+spring.thymeleaf.cache=false
+spring.mustache.suffix=.html
 
+logging.level.io=info
+logging.level.org.hibernate=info
+logging.level.org.springframework.web=info
+logging.level.org.springframework.security=info
+
+# spring.jpa.database=mysql
+# spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
+# spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+# spring.datasource.url=jdbc:mysql:
+# spring.datasource.username=
+# spring.datasource.password=
+# spring.session.store-type=none
+# spring.jpa.hibernate.ddl-auto=update
+# spring.jpa.generate-ddl=true
+# spring.jpa.show-sql=true
+
+# errorpage custom
+# server.error.whitelabel.enabled=false
+
+# fileupload size
+spring.servlet.multipart.max-file-size=-1
+spring.servlet.multipart.max-request-size=-1
+
+# sql format
+# spring.jpa.properties.hibernate.use_sql_comments=true
+# spring.jpa.properties.hibernate.format_sql=true

src/main/resources/static/404.html

@@ -0,0 +1,60 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Page Not Found</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <style>
+
+        * {
+            line-height: 1.2;
+            margin: 0;
+        }
+
+        html {
+            color: #888;
+            display: table;
+            font-family: sans-serif;
+            height: 100%;
+            text-align: center;
+            width: 100%;
+        }
+
+        body {
+            display: table-cell;
+            vertical-align: middle;
+            margin: 2em auto;
+        }
+
+        h1 {
+            color: #555;
+            font-size: 2em;
+            font-weight: 400;
+        }
+
+        p {
+            margin: 0 auto;
+            width: 280px;
+        }
+
+        @media only screen and (max-width: 280px) {
+
+            body, p {
+                width: 95%;
+            }
+
+            h1 {
+                font-size: 1.5em;
+                margin: 0 0 0.3em;
+            }
+
+        }
+
+    </style>
+</head>
+<body>
+    <h1>Page Not Found</h1>
+    <p>Sorry, but the page you were trying to view does not exist.</p>
+</body>
+</html>
+<!-- IE needs 512+ bytes: https://blogs.msdn.microsoft.com/ieinternals/2010/08/18/friendly-http-error-pages/ -->

src/main/resources/static/LICENSE.txt

@@ -0,0 +1,19 @@
+Copyright (c) HTML5 Boilerplate
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src/main/resources/static/browserconfig.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Please read: https://msdn.microsoft.com/en-us/library/ie/dn455106.aspx -->
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square70x70logo src="tile.png"/>
+            <square150x150logo src="tile.png"/>
+            <wide310x150logo src="tile-wide.png"/>
+            <square310x310logo src="tile.png"/>
+        </tile>
+    </msapplication>
+</browserconfig>