SONAR-16613 Migrate users field 'sonarlint_ad_seen' to use the new notice mechanism

6 files changed, 1 insertions, 41 deletions

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java
index a859286377e..c43e3b1dce3 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDao.java
@@ -125,10 +125,6 @@ public class UserDao implements Dao {
     mapper(session).updateSonarlintLastConnectionDate(login, system2.now());
   }
 
-  public void dismissSonarlintAd(DbSession session, String login) {
-    mapper(session).dismissSonarlintAd(login);
-  }
-
   public void deactivateUser(DbSession dbSession, UserDto user) {
     mapper(dbSession).deactivateUser(user.getLogin(), system2.now());
     auditPersister.deactivateUser(dbSession, new UserNewValue(user.getUuid(), user.getLogin()));
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDto.java
index 71dcfd94b7c..e9387657f66 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserDto.java
@@ -53,7 +53,6 @@ public class UserDto implements UserId {
   private String homepageParameter;
   private boolean local = true;
   private boolean resetPassword = false;
-  private boolean sonarlintAdSeen = false;
 
   /**
    * Date of the last time the user has accessed to the server.
@@ -252,15 +251,6 @@ public class UserDto implements UserId {
     return this;
   }
 
-  public boolean isSonarlintAdSeen() {
-    return sonarlintAdSeen;
-  }
-
-  public UserDto setSonarlintAdSeen(boolean sonarlintAdSeen) {
-    this.sonarlintAdSeen = sonarlintAdSeen;
-    return this;
-  }
-
   @CheckForNull
   public Long getLastConnectionDate() {
     return lastConnectionDate;
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java
index 802b1f1a30e..5e59ef4958f 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/user/UserMapper.java
@@ -79,6 +79,4 @@ public interface UserMapper {
   void clearHomepage(@Param("login") String login, @Param("now") long now);
 
   long countActiveSonarlintUsers(@Param("sinceDate") long sinceDate);
-
-  void dismissSonarlintAd(@Param("login") String login);
 }
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml
index 858b063cc51..3dfd081b18f 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/user/UserMapper.xml
@@ -22,7 +22,6 @@
         u.homepage_parameter as "homepageParameter",
         u.last_connection_date as "lastConnectionDate",
         u.last_sonarlint_connection as "lastSonarlintConnectionDate",
-        u.sonarlint_ad_seen as "sonarlintAdSeen",
         u.created_at as "createdAt",
         u.updated_at as "updatedAt"
     </sql>
@@ -160,13 +159,6 @@
         login = #{login, jdbcType=VARCHAR}
     </update>
 
-    <update id="dismissSonarlintAd" parameterType="map">
-        update users set
-        sonarlint_ad_seen = ${_true}
-        where
-        login = #{login, jdbcType=VARCHAR}
-    </update>
-
     <update id="deactivateUser" parameterType="map">
         update users set
         <include refid="deactivateUserUpdatedFields"/>
@@ -209,7 +201,6 @@
         crypted_password,
         hash_method,
         last_sonarlint_connection,
-        sonarlint_ad_seen,
         reset_password,
         homepage_type,
         homepage_parameter,
@@ -230,7 +221,6 @@
         #{user.cryptedPassword,jdbcType=VARCHAR},
         #{user.hashMethod,jdbcType=VARCHAR},
         #{user.lastSonarlintConnectionDate,jdbcType=BIGINT},
-        #{user.sonarlintAdSeen,jdbcType=BOOLEAN},
         #{user.resetPassword,jdbcType=BOOLEAN},
         #{user.homepageType,jdbcType=VARCHAR},
         #{user.homepageParameter,jdbcType=VARCHAR},
@@ -258,7 +248,6 @@
         homepage_parameter = #{user.homepageParameter, jdbcType=VARCHAR},
         last_connection_date = #{user.lastConnectionDate,jdbcType=BIGINT},
         last_sonarlint_connection = #{user.lastSonarlintConnectionDate,jdbcType=BIGINT},
-        sonarlint_ad_seen = #{user.sonarlintAdSeen,jdbcType=BOOLEAN},
         updated_at = #{user.updatedAt,jdbcType=BIGINT}
         where
         uuid = #{user.uuid, jdbcType=VARCHAR}
diff --git a/server/sonar-db-dao/src/schema/schema-sq.ddl b/server/sonar-db-dao/src/schema/schema-sq.ddl
index a9cfa3c66ad..074594cb5eb 100644
--- a/server/sonar-db-dao/src/schema/schema-sq.ddl
+++ b/server/sonar-db-dao/src/schema/schema-sq.ddl
@@ -993,8 +993,7 @@ CREATE TABLE "USERS"(
     "CREATED_AT" BIGINT,
     "UPDATED_AT" BIGINT,
     "RESET_PASSWORD" BOOLEAN NOT NULL,
-    "LAST_SONARLINT_CONNECTION" BIGINT,
-    "SONARLINT_AD_SEEN" BOOLEAN DEFAULT FALSE
+    "LAST_SONARLINT_CONNECTION" BIGINT
 );
 ALTER TABLE "USERS" ADD CONSTRAINT "PK_USERS" PRIMARY KEY("UUID");
 CREATE UNIQUE INDEX "USERS_LOGIN" ON "USERS"("LOGIN" NULLS FIRST);
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDaoTest.java
index b43af0453c0..6d2005ef246 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDaoTest.java
@@ -98,18 +98,6 @@ public class UserDaoTest {
   }
 
   @Test
-  public void dismiss_sonarlint_ad() {
-    UserDto user = db.users().insertUser(u -> u.setLogin("user"));
-    assertThat(user.isSonarlintAdSeen()).isFalse();
-
-    underTest.dismissSonarlintAd(session, "user");
-
-    user = db.users().selectUserByLogin("user").get();
-
-    assertThat(user.isSonarlintAdSeen()).isTrue();
-  }
-
-  @Test
   public void selectUsersByLogins() {
     db.users().insertUser(user -> user.setLogin("user1"));
     db.users().insertUser(user -> user.setLogin("user2"));