Fix saving configurations to accountList on changes

Author: Irene

src/main/java/fi/helsinki/cs/tmc/cli/backend/SettingsIo.java

@@ -13,6 +13,9 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 /**
  * Reads and writes to config files on the system.
@@ -67,6 +70,24 @@ public static boolean delete() {
         return true;
     }
 
+    public static void saveCurrentSettingsToAccountList(Settings settings) {
+        AccountList list = loadAccountList();
+        Set<Account> deletables = new HashSet<>();
+        for (Iterator<Account> i = list.iterator(); i.hasNext(); ) {
+            Account account = i.next();
+            if (account.getUsername().equals(settings.getAccount().getUsername())) {
+                if (!account.getUsername().isPresent()) {
+                    logger.error("Saveable account doesn't exist");
+                    return;
+                }
+                deletables.add(account);
+            }
+        }
+        deletables.stream().forEach(d -> list.deleteAccount(d.getUsername().get(), d.getServerAddress()));
+        list.addAccount(settings.getAccount());
+        saveAccountList(list);
+    }
+
     public static HashMap<String, String> loadProperties() {
         return loadPropertiesFrom(getConfigDirectory());
     }

src/main/java/fi/helsinki/cs/tmc/cli/command/ConfigCommand.java

@@ -1,5 +1,6 @@
 package fi.helsinki.cs.tmc.cli.command;
 
+import fi.helsinki.cs.tmc.cli.backend.SettingsIo;
 import fi.helsinki.cs.tmc.cli.core.AbstractCommand;
 import fi.helsinki.cs.tmc.cli.core.CliContext;
 import fi.helsinki.cs.tmc.cli.core.Command;
@@ -46,6 +47,7 @@ private void configureAllowedKeys() {
             }
             boolean send = Boolean.parseBoolean(newVal);
             context.getSettings().setSendDiagnostics(send);
+            SettingsIo.saveCurrentSettingsToAccountList(context.getSettings());
         });
 
         ALLOWED_KEYS.put("server-address", (key, address) -> {
@@ -54,6 +56,7 @@ private void configureAllowedKeys() {
                 throw new BadValueTypeException("Please start the address with http[s]://");
             }
             context.getSettings().setServerAddress(addr);
+            SettingsIo.saveCurrentSettingsToAccountList(context.getSettings());
         });
 
         ALLOWED_KEYS.put("update-date", (key, value) -> {
@@ -229,6 +232,7 @@ private void setPropertiesQuietly(String[] arguments) {
     private boolean saveValue(String key, String value) {
         try {
             ALLOWED_KEYS.get(key).apply(key, value);
+
         } catch (Exception e) {
             io.errorln(e.getMessage());
             return false;
@@ -252,5 +256,6 @@ private void addToProperties(String key, Object value) throws BadValueTypeExcept
             throw new BadValueTypeException("Color " + value + " not supported.");
         }
         properties.put(key, color);
+        SettingsIo.saveProperties(properties);
     }
 }

src/main/java/fi/helsinki/cs/tmc/cli/command/LoginCommand.java

@@ -128,7 +128,7 @@ private boolean getSendDiagnosticsAnswer(String username, String server) {
             } else if (sendDiagnostics.trim().toLowerCase().startsWith("n")) {
                 return false;
             }
-            io.println("Please answer y or n.");
+            io.println("Please answer y(es) or n(o).");
         }
     }
 }

src/main/java/fi/helsinki/cs/tmc/cli/command/OrganizationCommand.java

@@ -1,6 +1,8 @@
 package fi.helsinki.cs.tmc.cli.command;
 
 import fi.helsinki.cs.tmc.cli.backend.Account;
+import fi.helsinki.cs.tmc.cli.backend.Settings;
+import fi.helsinki.cs.tmc.cli.backend.SettingsIo;
 import fi.helsinki.cs.tmc.cli.backend.TmcUtil;
 import fi.helsinki.cs.tmc.cli.core.AbstractCommand;
 import fi.helsinki.cs.tmc.cli.core.CliContext;
@@ -31,9 +33,8 @@ public void getOptions(Options options) {
     @Override
     public void run(CliContext ctx, CommandLine args) {
         Optional<Organization> organization = chooseOrganization(ctx, args);
-        Account currentAccount = this.ctx.getSettings().getAccount();
-        currentAccount.setOrganization(organization);
-        this.ctx.getSettings().setAccount(currentAccount);
+        this.ctx.getSettings().setOrganization(organization);
+        SettingsIo.saveCurrentSettingsToAccountList(this.ctx.getSettings());
     }
 
     private List<Organization> listOrganizations() {

src/test/java/fi/helsinki/cs/tmc/cli/backend/SettingsIoTest.java

@@ -17,6 +17,7 @@
 
 public class SettingsIoTest {
 
+    public static final String STUB_SERVER = "stubServer";
     private AccountList accountList;
     private Account account;
     private Path tempDir;
@@ -119,4 +120,17 @@ public void loadingPropertiesWorks() {
         HashMap<String, String> loadedProps = SettingsIo.loadPropertiesFrom(tempDir);
         assertEquals(props, loadedProps);
     }
+
+    @Test
+    public void saveCurrentSettingsOverridesOldAccountWithSameUsername() {
+        AccountList oldList = new AccountList();
+        Account acc = new Account("username", "password", new Organization("old", "", "", "", false));
+        acc.setServerAddress(STUB_SERVER);
+        oldList.addAccount(acc);
+        Settings settings = new Settings("username", "password", new Organization("new", "", "", "", false));
+        settings.setServerAddress(STUB_SERVER);
+        SettingsIo.saveCurrentSettingsToAccountList(settings);
+        AccountList newList = SettingsIo.loadAccountList();
+        assertEquals("new", newList.getAccount("username", STUB_SERVER).getOrganization().get().getName());
+    }
 }

src/test/java/fi/helsinki/cs/tmc/cli/command/OrganizationCommandTest.java

@@ -26,6 +26,7 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
+import static org.powermock.api.mockito.PowerMockito.verifyStatic;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({SettingsIo.class, TmcUtil.class})
@@ -118,4 +119,13 @@ public void printsAllOrganizationsIfInvalidSlugGivenAsArgumentToOneLiner() {
         app.run(args);
         io.assertContains(TEST_ORGANIZATION.getName());
     }
+
+    @Test
+    public void saveConfigruationsToAccountList() {
+        when(TmcUtil.getOrganizationsFromServer(any(CliContext.class))).thenReturn(organizationList);
+        String[] args = {"organization", "-o", TEST_ORGANIZATION.getSlug()};
+        app.run(args);
+        verifyStatic();
+        SettingsIo.saveCurrentSettingsToAccountList(eq(settings));
+    }
 }