Merge branch 'main' of https://github.com/lavajuno/fsuvius

.gitignore

@@ -1,4 +1,5 @@
 users.dat
+data/photos/*
 .idea/workspace.xml
 .idea/vcs.xml
 

src/main/java/org/jmeifert/fsuvius/FsuviusController.java

@@ -6,9 +6,10 @@
 import io.github.bucket4j.Bandwidth;
 import io.github.bucket4j.Bucket;
 import io.github.bucket4j.Refill;
+import org.jmeifert.fsuvius.data.DatabaseController;
+import org.jmeifert.fsuvius.error.NotFoundException;
 import org.jmeifert.fsuvius.error.RateLimitException;
 import org.jmeifert.fsuvius.user.User;
-import org.jmeifert.fsuvius.user.UserRegistry;
 import org.jmeifert.fsuvius.util.Log;
 import org.springframework.web.bind.annotation.*;
 
@@ -18,23 +19,25 @@
 @RestController
 public class FsuviusController {
     private final Log log;
-    private final int MAX_REQUESTS_PER_5S = 100;
+
     private final Bucket bucket;
-    private UserRegistry userRegistry;
+    private DatabaseController databaseController;
 
     /**
      * Instantiates a FsuviusController.
      */
     public FsuviusController() {
         log = new Log("FsuviusController");
         log.print("Starting up...");
-        userRegistry = new UserRegistry();
-        Bandwidth limit= Bandwidth.classic(MAX_REQUESTS_PER_5S,
-                Refill.greedy(MAX_REQUESTS_PER_5S, Duration.ofSeconds(5)));
+        databaseController = new DatabaseController();
+        Bandwidth limit= Bandwidth.classic(FsuviusMap.MAX_REQUESTS_PER_SECOND,
+                Refill.greedy(FsuviusMap.MAX_REQUESTS_PER_SECOND, Duration.ofSeconds(1)));
         this.bucket = Bucket.builder().addLimit(limit).build();
-        log.print("Initialization complete. Welcome to Mount Fsuvius.");
+        log.print("===== Init complete. Welcome to Mount Fsuvius. =====");
     }
 
+    /* ===== BANK TOTALS ===== */
+
     /**
      * Gets the total amount of FSU in the bank.
      * @return The total amount of FSU in the bank
@@ -43,25 +46,26 @@ public FsuviusController() {
     public float getBankBalance() {
         if(bucket.tryConsume(1)) {
             float bal = 0.0F;
-            for(User i : userRegistry.getAll()) {
+            for(User i : databaseController.getUsers()) {
                 bal += i.getBalance();
             }
             return bal;
         }
         throw new RateLimitException();
     }
 
+    /* ===== USERS ===== */
+
     /**
      * Gets all registered Users.
      * @return All Users
      */
     @GetMapping("/api/users")
     public List<User> getUsers() {
         if(bucket.tryConsume(1)) {
-            return userRegistry.getAll();
+            return databaseController.getUsers();
         }
         throw new RateLimitException();
-
     }
 
     /**
@@ -73,21 +77,20 @@ public List<User> getUsers() {
     public User newUser(@RequestBody String name) {
         if(bucket.tryConsume(1)) {
             log.print("Handling request to create new user with name \"" + name + "\".");
-            return userRegistry.createUser(name);
+            return databaseController.createUser(name);
         }
         throw new RateLimitException();
-
     }
 
     /**
      * Gets a single user.
      * @param id The ID of the user to get
      * @return The User with the specified ID
      */
-    @GetMapping("/api/user/{id}")
+    @GetMapping("/api/users/{id}")
     public User getUser(@PathVariable String id) {
         if(bucket.tryConsume(1)) {
-            return userRegistry.getUser(id);
+            return databaseController.getUser(id);
         }
         throw new RateLimitException();
     }
@@ -98,11 +101,11 @@ public User getUser(@PathVariable String id) {
      * @param id ID of the User to edit
      * @return The edited User
      */
-    @PutMapping("/api/user/{id}")
+    @PutMapping("/api/users/{id}")
     public User editUser(@RequestBody User newUser, @PathVariable String id) {
         if(bucket.tryConsume(1)) {
             log.print("Handling request to edit user at ID \"" + id + "\".");
-            return userRegistry.editUser(id, newUser);
+            return databaseController.editUser(id, newUser);
         }
         throw new RateLimitException();
     }
@@ -111,13 +114,48 @@ public User editUser(@RequestBody User newUser, @PathVariable String id) {
      * Deletes a User with the given ID.
      * @param id The ID of the user to delete
      */
-    @DeleteMapping("/api/user/{id}")
+    @DeleteMapping("/api/users/{id}")
     public void deleteUser(@PathVariable String id) {
         if(bucket.tryConsume(1)) {
             log.print("Handling request to delete user at ID \"" + id + "\".");
-            userRegistry.deleteUser(id);
+            databaseController.deleteUser(id);
         } else {
             throw new RateLimitException();
         }
     }
+
+    /* ===== PHOTOS ===== */
+
+    /**
+     * Gets a photo by ID.
+     * Will result in an HTTP 404 if the photo cannot be found.
+     * @param id ID of the photo to get
+     * @return The photo with the specified ID
+     */
+    @GetMapping(value = "api/photos/{id}")
+    public byte[] getPhoto(@PathVariable String id) {
+        if(bucket.tryConsume(1)) {
+            try {
+                return databaseController.readPhoto(id);
+            } catch(NotFoundException e) {
+                log.print(1, "Couldn't find photo " + id + " in database.");
+                throw new NotFoundException();
+            }
+        }
+        throw new RateLimitException();
+    }
+
+    /**
+     * Updates a photo by ID. Will create it if it does not already exist.
+     * @param item New content of the photo
+     * @param id ID of the photo to update
+     */
+    @PostMapping("api/photos/{id}")
+    public void putPhoto(@RequestBody String item, @PathVariable String id) {
+        if(bucket.tryConsume(1)) {
+            databaseController.writePhoto(item, id);
+            return;
+        }
+        throw new RateLimitException();
+    }
 }

src/main/java/org/jmeifert/fsuvius/FsuviusMap.java

@@ -0,0 +1,22 @@
+package org.jmeifert.fsuvius;
+
+/**
+ * FsuviusMap contains user-modifiable constants that are used elsewhere in the program.
+ */
+public class FsuviusMap {
+    /**
+     * The maximum amount of requests per second the server will handle
+     * before refusing additional requests.
+     */
+    public static final int MAX_REQUESTS_PER_SECOND = 50;
+
+    /**
+     * The default photo for new users as base64.
+     */
+    public static final String DEFAULT_PHOTO = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAC4jAAAuIwF4pT92AAAE1ElEQVR42u2aSSxzXRjH/17S1xxi2hQxJKKhK7ERmyKIjQS7mrc2iAgLiaRiQcSiIcFGKjEtiBJi2phJDA2q2mKB1jxEWzqdb9d8l1YRXrTnn9zFc+5z7rnnl3Oe+5yndSGEEDix/sDJRQFQABQABUABUAAUAAVAAVAAFIBzyu21m2azGTKZDKurq1hfX4dMJsPGxgbOz88tPru7u4iNjf29BIgNXV1dkaqqKgLg1Wt3d5f8ZlkFoNPpSGlpqd3JOyyAqakpxiRLS0uJVColWq2WmM1m4kiyCqCsrIwBQKVSEUfVCwCPj4+Myefn5xNH1ovPoEajYdhRUVHOlQfo9Xrmd9LNzXnzgI9Kr9dje3sbEokEW1tbkMvlkMvlCAoKQnh4OEJCQuDv74/Q0FCEh4cjMjISbDYbrq6u35MHsNnsN33ynl8KhYKxn8xmM5mfnyfJycnvftbs7KzNfXpwcMDwbW9vf9c+fx7X+Hy+5Z7bJ4JEd3c3iouLnfMssLi4yJg8m82GSCTC/v4+7u7uYDAYYDKZoNVqoVarsba2ho6ODnC53J+VCqtUKsZyEQgEdpeYyWQiWVlZlj6RkZHk4ODgzctzenqaLC8v/94tcHx8jLGxMYstEAgQERHxpr5///5FSkrK794C19fXDDs6Otq5YoDBYGDYOp3OuQD4+Pgw7MHBwRcJlUMDCAsLQ3BwsMUWCoWorq7G3t4ezGaz4wPw9PREc3Mzo621tRWxsbHIzs5GT08Ptra2cHt767ipcF5eHjY3N9HS0sJoF4vFEIvFFpvP5yM1NRUJCQmIiYn59rPGpyVC7u7uaGxsxMDAANhstk2/np4eFBUVIS4uDunp6ZicnHwRRH9tVZjFYiEvLw87OzuYmZlBXV3dqzBmZ2eRnp6OiooK3N/fO05Z3NfXFzweD/X19VAqlVAoFBgfH0dDQ4NVIEKhEAKBAF/1d6XXAvGX/y7AYrEQFRWFjIwM1NbWQi6XY2VlBYWFhQy/pqYm7OzsWH/JP8zXNJlM73qHx8fHf1sPsBcrEhMTweVy4eXlhba2Nsu9zc1NxMXFWe3zf713uzzPVP/pCngNREFBAaNNpVJZ9fXw8GDYEonkXWPJZLKfBwAA/Pz8XhyMbMWUzMxMi93X14ebm5s3jWE0GtHV1fUzAZycnDDs0NBQm75ZWVkMe2Fh4U1jjIyMYGho6GsBjI+PQywW4+rq6s19zs7O0NDQwGhLSEiw6c/j8Rh2ZWUljo6OXq1QTUxMICcn5+sLIr29vRb/srIyMjw8TCQSCTk/PydarZYYjUZiNBrJw8MDUSqVZGBggHC5XMY4nZ2ddosuNTU1jD4cDoeMjo6Ss7MzotfricFgINfX12RtbY1UVFRY/Pr7+20WRD4dwEeu5uZm8vT0ZHeci4sLkpmZ+a5ni0QiotPpbAL41hiQlpaGubk5lJeXg8Vi2fUPDAyESCRCZWWlXd+kpCTMz8+Dz+fDxcXla/OA3Nxc8Hg8qNVqnJyc4PDwEGq1GpeXlzg9PYVUKoW3tzciIiLA4XDA4XAQHx//ocNQQEAAmpqaUFJSgtXVVSwtLUEqlUKj0VgOWMnJyYiPj3+RP1iTC/27vJOLAqAAKAAKgAKgACgACoACoAAoAAqAAqAAnFD/AZZ5oHgkh6rAAAAAAElFTkSuQmCC";
+
+    /**
+     * The maximum allowed size for photos. 1MB recommended.
+     */
+    public static final int MAX_PHOTO_SIZE = 1024 * 1024;
+}