Packets are now inside Deliveries. New users are now added to the database. Removed clientId column.

src/main/java/com/deliveryproject/easydelivery/KeycloakController.java

@@ -1,6 +1,7 @@
 package com.deliveryproject.easydelivery;
 
 import com.deliveryproject.easydelivery.Configuration.Constants;
+import com.deliveryproject.easydelivery.Models.AppUser;
 import com.deliveryproject.easydelivery.Models.KeycloakUser.User;
 import com.deliveryproject.easydelivery.RequestBody.Token;
 import com.deliveryproject.easydelivery.Roles.RoleInterface;
@@ -10,6 +11,7 @@ import com.mashape.unirest.http.HttpResponse;
 import com.mashape.unirest.http.Unirest;
 import com.mashape.unirest.http.exceptions.UnirestException;
 import org.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -26,6 +28,10 @@ import static com.deliveryproject.easydelivery.Utils.JWTUtils.decode;
 
 @RestController
 public class KeycloakController {
+    @Autowired
+    AppUserController appUserController;
+
+
     @RequestMapping(value = "/keycloak/login")
     @ResponseBody
     @CrossOrigin(origins = "http://localhost:3000", maxAge = 3600)
@@ -156,7 +162,9 @@ public class KeycloakController {
             String user_id = payload.getString("sub").toString();
 
             assignRoleToUser(user_id, new com.deliveryproject.easydelivery.Roles.User());
-
+            AppUser newUser = new AppUser();
+            newUser.setName(user.username);
+            appUserController.createUser(newUser);
             return new ResponseEntity<>(HttpStatus.OK);
         } catch (Exception e) {
             System.err.println(e);

src/main/java/com/deliveryproject/easydelivery/Models/AppUser.java

@@ -11,10 +11,7 @@ public class AppUser {
     @Column(name = "id")
     private Long id;
 
-    @Column(name = "client_id", nullable = false, unique = true)
-    private String clientId;
-
-    @Column(name = "name", nullable = false)
+    @Column(name = "name", nullable = false, unique = true)
     private String name;
 
     @OneToMany //(mappedBy = "user")
@@ -26,12 +23,6 @@ public class AppUser {
     public void setId(Long id) {
         this.id = id;
     }
-    public String getClientId() {
-        return clientId;
-    }
-    public void setClientId(String clientId) {
-        this.clientId = clientId;
-    }
     public String getName() {
         return name;
     }

src/main/java/com/deliveryproject/easydelivery/Models/Delivery.java

@@ -1,6 +1,7 @@
 package com.deliveryproject.easydelivery.Models;
 import javax.persistence.*;
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Entity
 @Table(name = "delivery")
@@ -20,8 +21,18 @@ public class Delivery {
     @Column(name = "delivery_time", nullable = false)
     private LocalDateTime deliveryTime;
 
+    @OneToMany
+    private List<Packet> Packets;
     // constructors, getters and setters
 
+    public List<Packet> getPackets() {
+        return Packets;
+    }
+
+    public void setPackets(List<Packet> packets) {
+        Packets = packets;
+    }
+
     public Long getId() {
         return id;
     }