User API Controller -- nataliehatz

.gitattributes

@@ -0,0 +1 @@
+* text=auto

.gitignore

@@ -1,20 +1,9 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+### Gradle ###
 .gradle
-build/
 !gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
+build/
 
 ### IntelliJ IDEA ###
 .idea
@@ -34,3 +23,14 @@ out/
 
 ### VS Code ###
 .vscode/
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

.vscode/launch.json

@@ -5,15 +5,18 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "type": "java",
-            "name": "Attach Spring",
-            "request": "attach",
-            "hostName": "localhost",
-            "port": 5005,
+            "command": "npm start",
+            "name": "Run Frontend",
+            "request": "launch",
+            "type": "node-terminal",
+            "cwd": "${workspaceFolder}/frontend",
+            "windows": {
+                "bashPath": "C:\\Windows\\sysnative\\bash.exe"
+            }
         },
         {
             "type": "java",
-            "name": "Launch Spring",
+            "name": "Run Backend",
             "request": "launch",
             "mainClass": "com.hna.webserver.WebServerApplication"
         }

README.md

@@ -1,10 +1,22 @@
-# Java Spring Web Server
+# HNAMAGOTCHI
 
 This is a Web Server application, modified from the Spring MVC serving web content tutorial repository (found [here](https://github.com/spring-guides/gs-serving-web-content)).
 A Web Server is an application that receives HTTP requests and returns web pages.
 Spring is a framework that we use to write our web server.
 It implements a bunch of features that are common to all web servers so we can focus on the portions that unique to our application.
 
+## Team
+
+- Norah
+- Caitlin Roach
+- Chloe E.
+- Sophie Fong
+- Maddy
+- Natalie 
+- Gabby H.
+- Freya
+
+
 # Getting Started
 
 Here, we have a basic "Hello World" web server. Fork this repository to quickly get your project set up with some starter code.

backend/.gitignore

@@ -0,0 +1,18 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+### Java Build Files ###
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/

backend/build.gradle

@@ -0,0 +1,32 @@
+plugins {
+	id 'java'
+	id 'org.springframework.boot' version '3.1.5'
+	id 'io.spring.dependency-management' version '1.1.3'
+}
+
+group = 'com.hna'
+version = '0.0.1-SNAPSHOT'
+
+java {
+	sourceCompatibility = '17'
+}
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+	implementation 'org.springframework.boot:spring-boot-starter-web'
+	runtimeOnly 'com.h2database:h2'
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+}
+
+tasks.named('bootBuildImage') {
+	builder = 'paketobuildpacks/builder-jammy-base:latest'
+}
+
+tasks.named('test') {
+	useJUnitPlatform()
+}

backend/src/main/java/com/hna/webserver/LoadDatabase.java

@@ -0,0 +1,26 @@
+package com.hna.webserver;
+
+import com.hna.webserver.model.User;
+import com.hna.webserver.repository.UserRepository;
+import com.hna.webserver.repository.CharbyRepository;
+import com.hna.webserver.model.Charby;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class LoadDatabase {
+    private static final Logger log = LoggerFactory.getLogger(LoadDatabase.class);
+
+    @Bean
+    CommandLineRunner initDatabase(UserRepository userRepository, CharbyRepository charbyRepository) {
+        return args -> {
+            log.info("Preloading " + userRepository.save(new User("Bilbo Baggins", "BBaggins@holynames-sea.org", "bilba", "hna!")));
+            log.info("Preloading " + userRepository.save(new User("Frodo Baggins", "FBaggins@holynames-sea.org", "froba", "H!Na")));
+            log.info("Preloading " + userRepository.save(new User("Gandalf Baggins", "GBaggins@holynames-sea.org", "ganba", "!AnH")));
+            log.info("Preloading " + charbyRepository.save(new Charby("Charby 1")));
+        };
+    }
+}

src/main/java/com/hna/webserver/controller/UserApiController.java → backend/src/main/java/com/hna/webserver/controller/CharbyApiController.java

@@ -1,7 +1,7 @@
 package com.hna.webserver.controller;
 
-import com.hna.webserver.model.User;
-import com.hna.webserver.repository.UserRepository;
+import com.hna.webserver.model.Charby;
+import com.hna.webserver.repository.CharbyRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -15,22 +15,22 @@
 
 @RestController
 @RequestMapping("/api")
-public class UserApiController {
+public class CharbyApiController {
 
 	@Autowired
-	UserRepository userRepository;
+	CharbyRepository CharbyRepository;
 
-	@GetMapping("/users")
-	public ResponseEntity<List<User>> all() {
-		return new ResponseEntity<>(userRepository.findAll(), HttpStatus.OK);
+	@GetMapping("/charbeez")
+	public ResponseEntity<List<Charby>> all() {
+		return new ResponseEntity<>(CharbyRepository.findAll(), HttpStatus.OK);
 	}
 
-	@GetMapping("/users/{id}")
-	public ResponseEntity<User> one(@PathVariable Long id) {
-		Optional<User> user = userRepository.findById(id);
+	@GetMapping("/charbeez/{id}")
+	public ResponseEntity<Charby> one(@PathVariable Long id) {
+		Optional<Charby> charby = CharbyRepository.findById(id);
 
-		if (user.isPresent()) {
-			return new ResponseEntity<>(user.get(), HttpStatus.OK);
+		if (charby.isPresent()) {
+			return new ResponseEntity<>(charby.get(), HttpStatus.OK);
 		}
 		return new ResponseEntity<>(HttpStatus.NOT_FOUND);
 	}

backend/src/main/java/com/hna/webserver/controller/UserApiController.java

@@ -0,0 +1,93 @@
+package com.hna.webserver.controller;
+
+import com.hna.webserver.model.User;
+import com.hna.webserver.repository.UserRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Optional;
+
+@RestController
+@RequestMapping("/api")
+public class UserApiController {
+
+	@Autowired
+	UserRepository userRepository;
+
+	@GetMapping("/users")
+	public ResponseEntity<List<User>> all() {
+		return new ResponseEntity<>(userRepository.findAll(), HttpStatus.OK);
+	}
+
+	@GetMapping("/users/{id}")
+	public ResponseEntity<User> one(@PathVariable Long id) {
+		Optional<User> user = userRepository.findById(id);
+
+		if (user.isPresent()) {
+			return new ResponseEntity<>(user.get(), HttpStatus.OK);
+		}
+		return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+	}
+	public void saveUser(@RequestBody User user){
+		User save = userRepository.save(user);
+	}
+	@PostMapping("/users/signup")
+	public ResponseEntity<User> signup(@RequestBody User user){
+		System.out.println(user);
+		if((user.getEmail()==null) || user.getEmail().equals("")){ // was getHnaEmail
+			System.out.println("Please enter an email.");
+			return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
+		}
+		if (user.getEmail().length() < 18 || !(user.getEmail().substring(user.getEmail().length()-17, user.getEmail().length()).equals("holynames-sea.org"))) {
+			System.out.println("Please enter an email with an HNA domain.");
+			return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
+		}
+		if((user.getName()==null || user.getName().equals(""))){
+			System.out.println("Please enter your name.");
+			return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
+		}
+		if(user.getPassword()==null || user.getPassword().equals("")){
+			System.out.println("Please enter a password.");
+			return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
+		}
+		if(user.getUsername()==null || user.getUsername().equals("")){
+			System.out.println("Please enter a username.");
+			return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
+		}
+		//store in variable, loop over and see if it exists
+		List<User> userList = userRepository.findAll();
+		for (int i = 0; i<userList.size(); i++){
+			if(userList.get(i).getUsername().equals(user.getUsername())){
+				System.out.println("This username has already been taken. Please enter another username.");
+				return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
+			}
+		}
+		saveUser(user);
+		return new ResponseEntity<>(HttpStatus.CREATED);
+
+	}
+	@PostMapping("/users/login")
+	public ResponseEntity<User> login(@RequestBody User user){
+		if(user.getPassword()==null || user.getPassword().equals("")){
+			System.out.println("Please enter a password.");
+			return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
+		}
+		if(user.getUsername()==null || user.getUsername().equals("")){
+			System.out.println("Please enter a username.");
+			return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
+		}
+
+		List<User> userList = userRepository.findAll();
+		for (int i = 0; i<userList.size(); i++){
+			if(userList.get(i).getUsername().equals(user.getUsername()) && userList.get(i).getPassword().equals(user.getPassword())){
+				return new ResponseEntity<>(HttpStatus.ACCEPTED);
+			}
+			System.out.println("Your username and password do not match. Please re-enter your log-in information.");
+			return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+		}
+	}
+
+}

backend/src/main/java/com/hna/webserver/model/Charby.java

@@ -0,0 +1,59 @@
+package com.hna.webserver.model;
+
+import jakarta.persistence.*;
+import java.time.LocalDate;
+
+@Entity
+@Table(name = "charbeez")
+public class Charby {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private long id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "birthday")
+    private LocalDate birthday;
+
+    public Charby() {
+
+    }
+
+    public Charby(String name) {
+        this.name = name;
+        this.birthday = LocalDate.now();
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getBirthday(){
+        return birthday.toString();
+    }
+
+    public void setBirthday(LocalDate date){
+        this.birthday = date;
+    }
+
+    @Override
+    public String toString() {
+        return "Charby [id=" + id + ", name=" + name + "]";
+    }
+
+
+    @ManyToOne
+    @JoinColumn (name = "user_id")
+    private User user;
+
+}