asdf

.idea/workspace.xml

@@ -2,7 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="ad381d05-32c5-4ad5-8041-a0cb51a71fd9" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/Account.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/Account.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/Account.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/User.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/model/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/UserControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/ProfileControllerTest.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -27,50 +36,29 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="9" column="20" lean-forward="true" selection-start-line="7" selection-start-column="4" selection-end-line="9" selection-end-column="20" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Account.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Account.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="FriendList.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java">
+      <file leaf-file-name="Profile.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="75">
-              <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+            <state relative-caret-position="450">
+              <caret line="30" column="22" selection-start-line="30" selection-start-column="22" selection-end-line="30" selection-end-column="22" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Map.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java">
+      <file leaf-file-name="Login.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+            <state relative-caret-position="705">
+              <caret line="47" column="27" selection-start-line="47" selection-start-column="27" selection-end-line="47" selection-end-column="27" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Destination.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
+      <file leaf-file-name="User.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="90">
-              <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+              <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -78,32 +66,29 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="HomeController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java">
+      <file leaf-file-name="application.properties" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="165">
+              <caret line="11" column="36" lean-forward="true" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="DestinationRepository.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/DestinationRepository.java">
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="75">
-              <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+            <state relative-caret-position="315">
+              <caret line="21" column="18" lean-forward="true" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="18" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="UserRepository.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java">
+      <file leaf-file-name="Destination.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="105">
-              <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+            <state relative-caret-position="360">
+              <caret line="28" column="28" lean-forward="true" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -147,8 +132,6 @@
         <option value="$PROJECT_DIR$/src/main/java/alidade/alidade.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/DestinationState.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/FutureDestination.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/repository/ProfileRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Feed.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/App.java" />
@@ -177,20 +160,23 @@
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/MessageBoard.java" />
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/HomeController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/config/PersistenceConfiguration.java" />
         <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
-        <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/map/DestinationRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/user/DestinationType.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/user/DestinationState.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/map/DestinationState.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/map/Destination.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/controller/DestinationController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Account.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/UserAccount.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/User.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Account.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java" />
       </list>
     </option>
   </component>
@@ -324,6 +310,11 @@
     <property name="project.structure.side.proportion" value="0.0" />
     <property name="settings.editor.selected.configurable" value="reference.settings.ide.settings.file-colors" />
   </component>
+  <component name="RecentsManager">
+    <key name="CreateClassDialog.RecentsKey">
+      <recent name="com.alidade.model" />
+    </key>
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -385,12 +376,12 @@
       </option>
       <patterns />
     </configuration>
-    <configuration name="UserControllerTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="ProfileControllerTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="SharedTravelMap" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="UserControllerTest" />
+      <option name="MAIN_CLASS_NAME" value="ProfileControllerTest" />
       <option name="METHOD_NAME" />
       <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" value="-ea" />
@@ -447,7 +438,7 @@
     <list>
       <item itemvalue="Spring Boot.SharedTravelApp" />
       <item itemvalue="Application.SharedTravelApp" />
-      <item itemvalue="JUnit.UserControllerTest" />
+      <item itemvalue="JUnit.ProfileControllerTest" />
       <item itemvalue="JUnit.AppTest" />
       <item itemvalue="JUnit.All in SharedTravelMap" />
     </list>
@@ -456,7 +447,7 @@
         <item itemvalue="Application.SharedTravelApp" />
         <item itemvalue="JUnit.All in SharedTravelMap" />
         <item itemvalue="JUnit.AppTest" />
-        <item itemvalue="JUnit.UserControllerTest" />
+        <item itemvalue="JUnit.ProfileControllerTest" />
       </list>
     </recent_temporary>
   </component>
@@ -487,7 +478,7 @@
       <workItem from="1531762938122" duration="894000" />
       <workItem from="1531932455408" duration="4691000" />
       <workItem from="1532000475012" duration="5571000" />
-      <workItem from="1532369057862" duration="1753000" />
+      <workItem from="1532369057862" duration="7541000" />
     </task>
     <servers />
   </component>
@@ -506,7 +497,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="51756000" />
+    <option name="totallyTimeSpent" value="57544000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -544,6 +535,7 @@
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19009584" />
       <window_info anchor="right" id="Bean Validation" order="4" />
       <window_info id="Web" order="3" side_tool="true" />
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32935324" />
       <window_info anchor="right" id="Theme Preview" order="3" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Messages" order="8" weight="0.3283582" />
@@ -552,7 +544,6 @@
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Find" order="1" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -562,14 +553,13 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/FeedController.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Friend.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/FeedRepository.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/FriendRepository.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/ProfileRepository.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/UserProfile.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/TravelFeed.java" />
-    <entry file="file://$PROJECT_DIR$/src/test/java/UserControllerTest.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/ProfileControllerTest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <caret selection-end-line="42" selection-end-column="5" />
@@ -668,20 +658,6 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/UserLogin.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/config/PersistenceConfiguration.java" />
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="503">
-          <caret line="39" column="21" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6.jar!/com/mysql/jdbc/PreparedStatement.class">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="2005">
@@ -696,17 +672,17 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/DestinationRepository.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="75">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
+        <state relative-caret-position="105">
+          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -723,10 +699,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/controller/UserController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        <state relative-caret-position="180">
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -743,41 +719,62 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/DestinationRepository.java">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+        <state relative-caret-position="315">
+          <caret line="21" column="18" lean-forward="true" selection-start-line="21" selection-start-column="18" selection-end-line="21" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/repository/UserRepository.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/FriendList.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="9" column="20" lean-forward="true" selection-start-line="9" selection-start-column="20" selection-end-line="9" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="11" column="36" lean-forward="true" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
-          <caret line="7" column="17" selection-start-line="7" selection-start-column="17" selection-end-line="7" selection-end-column="17" />
+          <caret line="8" column="4" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="4" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="90">
+          <caret line="6" lean-forward="true" selection-start-line="6" selection-end-line="6" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Map.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Login.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="10" column="4" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
+        <state relative-caret-position="705">
+          <caret line="47" column="27" selection-start-line="47" selection-start-column="27" selection-end-line="47" selection-end-column="27" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/User.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Profile.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="20" lean-forward="true" selection-start-line="7" selection-start-column="4" selection-end-line="9" selection-end-column="20" />
+        <state relative-caret-position="450">
+          <caret line="30" column="22" selection-start-line="30" selection-start-column="22" selection-end-line="30" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Account.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/alidade/model/Destination.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="18" column="1" lean-forward="true" selection-start-line="18" selection-start-column="1" selection-end-line="18" selection-end-column="1" />
+        <state relative-caret-position="360">
+          <caret line="28" column="28" lean-forward="true" selection-start-line="28" selection-start-column="28" selection-end-line="28" selection-end-column="28" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>

src/main/java/com/alidade/controller/UserController.java

@@ -1,6 +1,6 @@
 package com.alidade.controller;
 
-import com.alidade.model.User;
+import com.alidade.model.Profile;
 import com.alidade.repository.UserRepository;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,30 +17,30 @@ public class UserController {
 
     //CREATE
     @RequestMapping(value = "users", method = RequestMethod.POST)
-    public ResponseEntity<User> create(@RequestBody User user){
-        return new ResponseEntity<User>(userRepository.saveAndFlush(user),HttpStatus.CREATED);
+    public ResponseEntity<Profile> create(@RequestBody Profile profile){
+        return new ResponseEntity<Profile>(userRepository.saveAndFlush(profile),HttpStatus.CREATED);
     }
 
     //READ
     @RequestMapping(value = "users/{id}", method = RequestMethod.GET)
-    public User get(@PathVariable Long id){
+    public Profile get(@PathVariable Long id){
         return userRepository.findOne(id);
     }
 
     //UPDATE
     @RequestMapping(value = "users/{id}", method = RequestMethod.PUT)
-    public User update(@PathVariable Long id, @RequestBody User user){
-        User userToUpdate = userRepository.findOne(id);
-        BeanUtils.copyProperties(user, userToUpdate);
-        return userRepository.saveAndFlush(userToUpdate);
+    public Profile update(@PathVariable Long id, @RequestBody Profile profile){
+        Profile profileToUpdate = userRepository.findOne(id);
+        BeanUtils.copyProperties(profile, profileToUpdate);
+        return userRepository.saveAndFlush(profileToUpdate);
     }
 
     //DELETE
     @RequestMapping(value = "users/{id}", method = RequestMethod.DELETE)
-    public User delete(@PathVariable Long id){
-        User userToDelete = userRepository.findOne(id);
-        userRepository.delete(userToDelete);
-        return userToDelete;
+    public Profile delete(@PathVariable Long id){
+        Profile profileToDelete = userRepository.findOne(id);
+        userRepository.delete(profileToDelete);
+        return profileToDelete;
     }
 
 

src/main/java/com/alidade/model/Account.java

@@ -1,19 +0,0 @@
-package com.alidade.model;
-
-import sun.java2d.cmm.Profile;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-
-@Entity
-public class Account {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
-    private Profile profile;
-    private Auth auth;
-
-}

src/main/java/com/alidade/model/Destination.java

@@ -1,5 +1,9 @@
 package com.alidade.model;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
 import javax.persistence.*;
 import java.util.Date;
 
@@ -18,7 +22,13 @@ public class Destination {
     private String favoriteThing;
     private String notes;
 
-    public void setId(long id) {
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "profile_id", nullable = false)
+    @OnDelete(action = OnDeleteAction.CASCADE)
+    @JsonIgnore
+    private Profile profile;
+
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -89,4 +99,13 @@ public class Destination {
     public void setNotes(String notes) {
         this.notes = notes;
     }
+
+    public Profile getProfile() {
+        return profile;
+    }
+
+    public void setProfile(Profile profile) {
+        this.profile = profile;
+    }
+
 }

src/main/java/com/alidade/model/FriendList.java

@@ -1,13 +0,0 @@
-package com.alidade.model;
-
-import javax.persistence.*;
-import java.util.List;
-
-@Entity
-public class FriendList {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
-//    @OneToMany(targetEntity = User.class)
-//    private List<User> friends;
-}

src/main/java/com/alidade/model/Login.java

@@ -0,0 +1,55 @@
+package com.alidade.model;
+
+import javax.persistence.*;
+
+@Entity
+public class Login {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    @Column(name = "email")
+    private String email;
+
+    @Column(name = "password")
+    private String password;
+
+    @OneToOne(fetch = FetchType.LAZY,
+            optional=false)
+    @JoinColumn(name = "user_id",
+            nullable = false)
+    private User user;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+}

src/main/java/com/alidade/model/Map.java

@@ -1,12 +0,0 @@
-package com.alidade.model;
-
-import javax.persistence.*;
-import java.util.List;
-
-@Entity
-public class Map {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
-    private List<Destination> destinations;
-}

src/main/java/com/alidade/model/Profile.java

@@ -0,0 +1,88 @@
+package com.alidade.model;
+
+import javax.persistence.*;
+
+@Entity
+public class Profile {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    @Column(name = "username")
+    private String userName;
+
+    @Column(name = "home_city")
+    private String homeCity;
+
+    @Column(name = "home_country")
+    private String homeCountry;
+
+    @Column(name = "description")
+    private String description;
+
+    @Column(name = "image_path")
+    private String imagePath;
+
+    @OneToOne(fetch = FetchType.LAZY,
+            optional=false)
+    @JoinColumn(name = "user_id",
+            nullable = false)
+    private User user;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getHomeCity() {
+        return homeCity;
+    }
+
+    public void setHomeCity(String homeCity) {
+        this.homeCity = homeCity;
+    }
+
+    public String getHomeCountry() {
+        return homeCountry;
+    }
+
+    public void setHomeCountry(String homeCountry) {
+        this.homeCountry = homeCountry;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getImagePath() {
+        return imagePath;
+    }
+
+    public void setImagePath(String imagePath) {
+        this.imagePath = imagePath;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+}

src/main/java/com/alidade/model/User.java

@@ -1,5 +1,7 @@
 package com.alidade.model;
 
+import sun.java2d.cmm.Profile;
+
 import javax.persistence.*;
 
 @Entity
@@ -8,13 +10,22 @@ public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
-    private String userName;
+
+    @Column(name = "FIRST_NAME")
     private String firstName;
+
+    @Column(name = "LAST_NAME")
     private String lastName;
-    private String homeCity;
-    private String homeCountry;
-    private String description;
-    private String imagePath;
+
+    @OneToOne(fetch = FetchType.LAZY,
+            cascade = CascadeType.ALL,
+            mappedBy = "user")
+    private Login login;
+
+    @OneToOne(fetch = FetchType.LAZY,
+            cascade = CascadeType.ALL,
+            mappedBy = "user")
+    private Profile profile;
 
     public Long getId() {
         return id;
@@ -24,14 +35,6 @@ public class User {
         this.id = id;
     }
 
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
     public String getFirstName() {
         return firstName;
     }
@@ -48,36 +51,20 @@ public class User {
         this.lastName = lastName;
     }
 
-    public String getHomeCity() {
-        return homeCity;
-    }
-
-    public void setHomeCity(String homeCity) {
-        this.homeCity = homeCity;
-    }
-
-    public String getHomeCountry() {
-        return homeCountry;
-    }
-
-    public void setHomeCountry(String homeCountry) {
-        this.homeCountry = homeCountry;
-    }
-
-    public String getDescription() {
-        return description;
+    public Login getLogin() {
+        return login;
     }
 
-    public void setDescription(String description) {
-        this.description = description;
+    public void setLogin(Login login) {
+        this.login = login;
     }
 
-    public String getImagePath() {
-        return imagePath;
+    public Profile getProfile() {
+        return profile;
     }
 
-    public void setImagePath(String imagePath) {
-        this.imagePath = imagePath;
+    public void setProfile(Profile profile) {
+        this.profile = profile;
     }
 
 }

src/main/java/com/alidade/repository/UserRepository.java

@@ -1,9 +1,9 @@
 package com.alidade.repository;
 
-import com.alidade.model.User;
+import com.alidade.model.Profile;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface UserRepository extends JpaRepository<User, Long> {
+public interface UserRepository extends JpaRepository<Profile, Long> {
 }

src/test/java/UserControllerTest.java → src/test/java/ProfileControllerTest.java

@@ -1,5 +1,5 @@
 import com.alidade.controller.UserController;
-import com.alidade.model.User;
+import com.alidade.model.Profile;
 import com.alidade.repository.UserRepository;
 import org.junit.Before;
 import org.junit.Test;
@@ -12,7 +12,7 @@ import static org.hamcrest.core.Is.is;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class UserControllerTest {
+public class ProfileControllerTest {
 
     @InjectMocks
     private UserController uc;
@@ -28,18 +28,18 @@ public class UserControllerTest {
 
     @Test
     public void testUserCreate(){
-        User user = new User();
-        user.setId(1L);
+        Profile profile = new Profile();
+        profile.setId(1L);
     }
 
     @Test
     public void testUserGet(){
-        User user = new User();
-        user.setId(1L);
-        when(userRepository.findOne(1l)).thenReturn(user);
-        User userTest = uc.get(1L);
+        Profile profile = new Profile();
+        profile.setId(1L);
+        when(userRepository.findOne(1l)).thenReturn(profile);
+        Profile profileTest = uc.get(1L);
         verify(userRepository).findOne(1l);
-        assertThat(userTest.getId(), is(1l));
+        assertThat(profileTest.getId(), is(1l));
     }
 
 }