CHE-4372; add unique constraing for factory name + user

wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/FactoryManager.java

@@ -30,6 +30,7 @@
 import java.util.stream.Collectors;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.common.base.Strings.isNullOrEmpty;
 import static java.util.Objects.requireNonNull;
 import static org.eclipse.che.api.factory.shared.Constants.HTML_SNIPPET_TYPE;
 import static org.eclipse.che.api.factory.shared.Constants.IFRAME_SNIPPET_TYPE;
@@ -42,8 +43,12 @@
 @Singleton
 public class FactoryManager {
 
+    private final FactoryDao factoryDao;
+
     @Inject
-    private FactoryDao factoryDao;
+    public FactoryManager(FactoryDao factoryDao) {
+        this.factoryDao = factoryDao;
+    }
 
     /**
      * Stores {@link Factory} instance.
@@ -82,6 +87,9 @@ public Factory saveFactory(Factory factory, Set<FactoryImage> images) throws Con
         requireNonNull(factory);
         final FactoryImpl newFactory = new FactoryImpl(factory, images);
         newFactory.setId(NameGenerator.generate("factory", 16));
+        if (isNullOrEmpty(newFactory.getName())) {
+           newFactory.setName(NameGenerator.generate("f", 9));
+        }
         return factoryDao.create(newFactory);
     }
 
@@ -133,8 +141,12 @@ public Factory updateFactory(Factory update, Set<FactoryImage> images) throws Co
                                                                                   ServerException {
         requireNonNull(update);
         final AuthorImpl creator = factoryDao.getById(update.getId()).getCreator();
+        FactoryImpl updateImpl = new FactoryImpl(update, images);
+        if (isNullOrEmpty(updateImpl.getName())) {
+            updateImpl.setName(NameGenerator.generate("f", 9));
+        }
         return factoryDao.update(FactoryImpl.builder()
-                                            .from(new FactoryImpl(update, images))
+                                            .from(updateImpl)
                                             .setCreator(new AuthorImpl(creator.getUserId(), creator.getCreated()))
                                             .build());
     }

wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/FactoryManagerTest.java

@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2012-2017 Codenvy, S.A.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Codenvy, S.A. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.che.api.factory.server;
+
+import org.eclipse.che.api.factory.server.model.impl.AuthorImpl;
+import org.eclipse.che.api.factory.server.model.impl.FactoryImpl;
+import org.eclipse.che.api.factory.server.spi.FactoryDao;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.testng.MockitoTestNGListener;
+import org.testng.annotations.Listeners;
+import org.testng.annotations.Test;
+
+import static com.google.common.base.Strings.isNullOrEmpty;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertFalse;
+
+/**
+ * @author Max Shaposhnik ([email protected]) on 3/20/17.
+ */
+@Listeners(value = {MockitoTestNGListener.class})
+public class FactoryManagerTest {
+
+    @Mock
+    private FactoryDao factoryDao;
+
+    @InjectMocks
+    private FactoryManager factoryManager;
+
+    @Captor
+    private ArgumentCaptor<FactoryImpl> factoryCaptor;
+
+    @Test
+    public void shouldGenerateNameOnFactoryCreation() throws Exception {
+        final FactoryImpl factory = FactoryImpl.builder().generateId().build();
+        factoryManager.saveFactory(factory);
+        verify(factoryDao).create(factoryCaptor.capture());
+        assertFalse(isNullOrEmpty(factoryCaptor.getValue().getName()));
+    }
+
+    @Test
+    public void shouldGenerateNameOnFactoryUpdate() throws Exception {
+        final AuthorImpl author = new AuthorImpl();
+        author.setCreated(1231241234L);
+        author.setUserId("user123123");
+        final FactoryImpl factory = FactoryImpl.builder().generateId().setCreator(author).build();
+        when(factoryDao.getById(eq(factory.getId()))).thenReturn(factory);
+        factoryManager.updateFactory(factory);
+        verify(factoryDao).update(factoryCaptor.capture());
+        assertFalse(isNullOrEmpty(factoryCaptor.getValue().getName()));
+    }
+}

wsmaster/che-core-api-factory/src/test/java/org/eclipse/che/api/factory/server/spi/tck/FactoryDaoTest.java

@@ -131,15 +131,14 @@ public void shouldThrowConflictExceptionWhenCreatingFactoryWithExistingId() thro
         factoryDao.create(factory);
     }
 
-    // TODO fix after issue: https://github.com/eclipse/che/issues/2110
-//    @Test(expectedExceptions = ConflictException.class)
-//    public void shouldThrowConflictExceptionWhenCreatingFactoryWithExistingNameAndUserId() throws Exception {
-//        final FactoryImpl factory = createFactory(10, users[0].getId());
-//        final FactoryImpl existing = factories[0];
-//        factory.getCreator().setUserId(existing.getCreator().getUserId());
-//        factory.setName(existing.getName());
-//        factoryDao.create(factory);
-//    }
+    @Test(expectedExceptions = ConflictException.class)
+    public void shouldThrowConflictExceptionWhenCreatingFactoryWithExistingNameAndUserId() throws Exception {
+        final FactoryImpl factory = createFactory(10, users[0].getId());
+        final FactoryImpl existing = factories[0];
+        factory.getCreator().setUserId(existing.getCreator().getUserId());
+        factory.setName(existing.getName());
+        factoryDao.create(factory);
+    }
 
     @Test
     public void shouldUpdateFactory() throws Exception {
@@ -160,14 +159,13 @@ public void shouldUpdateFactory() throws Exception {
         assertEquals(factoryDao.getById(update.getId()), update);
     }
 
-// TODO fix after issue: https://github.com/eclipse/che/issues/2110
-//    @Test(expectedExceptions = ConflictException.class)
-//    public void shouldThrowConflictExceptionWhenUpdateFactoryWithExistingNameAndUserId() throws Exception {
-//        final FactoryImpl update = factories[0];
-//        update.setName(factories[1].getName());
-//        update.getCreator().setUserId(factories[1].getCreator().getUserId());
-//        factoryDao.update(update);
-//    }
+    @Test(expectedExceptions = ConflictException.class)
+    public void shouldThrowConflictExceptionWhenUpdateFactoryWithExistingNameAndUserId() throws Exception {
+        final FactoryImpl update = factories[0];
+        update.setName(factories[1].getName());
+        update.getCreator().setUserId(factories[1].getCreator().getUserId());
+        factoryDao.update(update);
+    }
 
     @Test(expectedExceptions = NullPointerException.class)
     public void shouldThrowNpeWhenFactoryUpdateIsNull() throws Exception {

wsmaster/che-core-sql-schema/src/main/resources/che-schema/5.6.0/3__create_factory_name_plus_userid_index.sql

@@ -0,0 +1,16 @@
+--
+--  [2012] - [2017] Codenvy, S.A.
+--  All Rights Reserved.
+--
+-- NOTICE:  All information contained herein is, and remains
+-- the property of Codenvy S.A. and its suppliers,
+-- if any.  The intellectual and technical concepts contained
+-- herein are proprietary to Codenvy S.A.
+-- and its suppliers and may be covered by U.S. and Foreign Patents,
+-- patents in process, and are protected by trade secret or copyright law.
+-- Dissemination of this information or reproduction of this material
+-- is strictly forbidden unless prior written permission is obtained
+-- from Codenvy S.A..
+--
+
+CREATE UNIQUE INDEX index_name_plus_userid ON che_factory (user_id, name);

wsmaster/che-core-sql-schema/src/main/resources/che-schema/5.6.0/postgresql/3__create_factory_name_plus_userid_index.sql

@@ -0,0 +1,42 @@
+--
+--  [2012] - [2017] Codenvy, S.A.
+--  All Rights Reserved.
+--
+-- NOTICE:  All information contained herein is, and remains
+-- the property of Codenvy S.A. and its suppliers,
+-- if any.  The intellectual and technical concepts contained
+-- herein are proprietary to Codenvy S.A.
+-- and its suppliers and may be covered by U.S. and Foreign Patents,
+-- patents in process, and are protected by trade secret or copyright law.
+-- Dissemination of this information or reproduction of this material
+-- is strictly forbidden unless prior written permission is obtained
+-- from Codenvy S.A..
+--
+
+UPDATE che_factory
+SET name = concat('f', right(id, 9)) WHERE name IS NULL OR name = '';
+
+WITH dupes AS
+  ( SELECT id, user_id, name
+    FROM che_factory
+    WHERE (name,user_id)
+    IN (SELECT name, user_id
+      FROM che_factory
+      GROUP BY name, user_id
+      HAVING count(*) > 1)
+  ),
+  uniques AS
+  ( WITH q as
+    ( SELECT *, row_number()
+      OVER (PARTITION BY name,user_id ORDER BY name,user_id)
+      AS rn FROM che_factory
+    )
+    SELECT id FROM q WHERE rn = 1
+  )
+UPDATE che_factory
+SET name = concat(che_factory.name, '-', right(dupes.id, 9))
+FROM dupes, uniques
+WHERE dupes.id = che_factory.id AND NOT EXISTS (SELECT id FROM uniques WHERE che_factory.id = uniques.id);
+
+
+CREATE UNIQUE INDEX index_name_plus_userid ON che_factory (user_id, name);