If no current Sone exists, return an error.

[Sone.git] / src / main / java / net / pterodactylus / sone / web / EditProfilePage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java b/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
index 30c90bc..df5a352 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - EditProfilePage.java - Copyright © 2010–2012 David Roden
+ * Sone - EditProfilePage.java - Copyright © 2010–2013 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.web;
 
+import static net.pterodactylus.sone.data.Identified.GET_ID;
+
 import java.util.List;
 
 import net.pterodactylus.sone.data.Profile;
@@ -27,8 +29,11 @@ import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.web.Method;
+
 import freenet.clients.http.ToadletContext;
 
+import com.google.common.base.Optional;
+
 /**
  * This page lets the user edit her profile.
  *
@@ -52,9 +57,6 @@ public class EditProfilePage extends SoneTemplatePage {
        // TEMPLATEPAGE METHODS
        //
 
-       /**
-        * {@inheritDoc}
-        */
        @Override
        protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
                super.processTemplate(request, templateContext);
@@ -77,15 +79,13 @@ public class EditProfilePage extends SoneTemplatePage {
                                birthDay = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("birth-day", 256).trim());
                                birthMonth = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("birth-month", 256).trim());
                                birthYear = Numbers.safeParseInteger(request.getHttpRequest().getPartAsStringFailsafe("birth-year", 256).trim());
-                               avatarId = request.getHttpRequest().getPartAsStringFailsafe("avatar-id", 36);
-                               profile.setFirstName(firstName.length() > 0 ? firstName : null);
-                               profile.setMiddleName(middleName.length() > 0 ? middleName : null);
-                               profile.setLastName(lastName.length() > 0 ? lastName : null);
-                               profile.setBirthDay(birthDay).setBirthMonth(birthMonth).setBirthYear(birthYear);
-                               profile.setAvatar(webInterface.getCore().getImage(avatarId, false));
+                               avatarId = request.getHttpRequest().getPartAsStringFailsafe("avatarId", 36);
+                               profile.modify().setFirstName(getNameFromFormField(firstName)).setMiddleName(getNameFromFormField(middleName)).setLastName(getNameFromFormField(lastName)).update();
+                               profile.modify().setBirthDay(birthDay).setBirthMonth(birthMonth).setBirthYear(birthYear).update();
+                               profile.setAvatar(webInterface.getCore().getImage(avatarId).transform(GET_ID));
                                for (Field field : fields) {
                                        String value = request.getHttpRequest().getPartAsStringFailsafe("field-" + field.getId(), 400);
-                                       field.setValue(value);
+                                       profile.setField(field, value);
                                }
                                currentSone.setProfile(profile);
                                webInterface.getCore().touchConfiguration();
@@ -109,21 +109,21 @@ public class EditProfilePage extends SoneTemplatePage {
                                }
                                id = getFieldId(request, "move-up-field-");
                                if (id != null) {
-                                       Field field = profile.getFieldById(id);
-                                       if (field == null) {
+                                       Optional<Field> field = profile.getFieldById(id);
+                                       if (!field.isPresent()) {
                                                throw new RedirectException("invalid.html");
                                        }
-                                       profile.moveFieldUp(field);
+                                       profile.moveFieldUp(field.get());
                                        currentSone.setProfile(profile);
                                        throw new RedirectException("editProfile.html#profile-fields");
                                }
                                id = getFieldId(request, "move-down-field-");
                                if (id != null) {
-                                       Field field = profile.getFieldById(id);
-                                       if (field == null) {
+                                       Optional<Field> field = profile.getFieldById(id);
+                                       if (!field.isPresent()) {
                                                throw new RedirectException("invalid.html");
                                        }
-                                       profile.moveFieldDown(field);
+                                       profile.moveFieldDown(field.get());
                                        currentSone.setProfile(profile);
                                        throw new RedirectException("editProfile.html#profile-fields");
                                }
@@ -139,10 +139,14 @@ public class EditProfilePage extends SoneTemplatePage {
                templateContext.set("birthDay", birthDay);
                templateContext.set("birthMonth", birthMonth);
                templateContext.set("birthYear", birthYear);
-               templateContext.set("avatar-id", avatarId);
+               templateContext.set("avatarId", avatarId);
                templateContext.set("fields", fields);
        }
 
+       private String getNameFromFormField(String name) {
+               return name.length() > 0 ? name : null;
+       }
+
        //
        // PRIVATE METHODS
        //
@@ -158,7 +162,7 @@ public class EditProfilePage extends SoneTemplatePage {
         * @return The parsed ID, or {@code null} if there was no part matching the
         *         given string
         */
-       private String getFieldId(FreenetRequest request, String partNameStart) {
+       private static String getFieldId(FreenetRequest request, String partNameStart) {
                for (String partName : request.getHttpRequest().getParts()) {
                        if (partName.startsWith(partNameStart)) {
                                return partName.substring(partNameStart.length());