initial removal of user-assignment and user-assignment-index accessors

modules/assignment/src/main/java/com/intuit/wasabi/assignment/impl/AssignmentsImpl.java

@@ -219,7 +219,7 @@ public Assignment getSingleAssignment(User.ID userID, Application.Name applicati
                     Assignment.Status.EXPERIMENT_EXPIRED);
         }
 
-        Assignment assignment = assignmentsRepository.getAssignment(experimentID, userID, context);
+        Assignment assignment = assignmentsRepository.getAssignment(experimentID, applicationName, userID, context);
         if (assignment == null) {
             if (createAssignment) {
                 if (experiment.getState() == Experiment.State.PAUSED) {
@@ -536,7 +536,7 @@ public Assignment putAssignment(User.ID userID, Application.Name applicationName
         }
 
         //throw exception if assignment already exists for user unless overwrite == true
-        Assignment currentAssignment = assignmentsRepository.getAssignment(experimentID, userID, context);
+        Assignment currentAssignment = assignmentsRepository.getAssignment(experimentID, applicationName, userID, context);
         if (!overwrite && currentAssignment != null && !currentAssignment.isBucketEmpty()) {
                 throw new AssignmentExistsException(userID, applicationName, experimentLabel);
         }

modules/repository-datastax/src/main/java/com/intuit/wasabi/repository/AssignmentsRepository.java

@@ -85,7 +85,7 @@ Table<Experiment.ID, Experiment.Label, String> getAssignments(User.ID userID, Ap
      * @param context      Environment context
      * @return Assignment
      */
-    Assignment getAssignment(Experiment.ID experimentID, User.ID userID, Context context);
+    Assignment getAssignment(Experiment.ID experimentID, Application.Name appName, User.ID userID, Context context);
 
     /**
      * Delete assignment for experiment, user and application
@@ -107,6 +107,7 @@ void deleteAssignment(Experiment experiment, User.ID userID, Context context, Ap
      * @param date       Date of assignment
      * @return Assignment
      */
+    @Deprecated
     Assignment assignUserToOld(Assignment assignment, Date date);
 
     /**

modules/repository-datastax/src/main/java/com/intuit/wasabi/repository/cassandra/CassandraRepositoryModule.java

@@ -77,7 +77,6 @@ protected void configure() {
         bind(ExperimentPageAccessor.class).toProvider(ExperimentPageAccessorProvider.class).in(Singleton.class);
         bind(PrioritiesAccessor.class).toProvider(PrioritiesAccessorProvider.class).in(Singleton.class);
         bind(StagingAccessor.class).toProvider(StagingAccessorProvider.class).in(Singleton.class);
-        bind(UserAssignmentAccessor.class).toProvider(UserAssignmentAccessorProvider.class).in(Singleton.class);
         bind(UserFeedbackAccessor.class).toProvider(UserFeedbackAccessorProvider.class).in(Singleton.class);
         bind(UserInfoAccessor.class).toProvider(UserInfoAccessorProvider.class).in(Singleton.class);
         bind(UserRoleAccessor.class).toProvider(UserRoleAccessorProvider.class).in(Singleton.class);
@@ -88,7 +87,6 @@ protected void configure() {
         bind(ExperimentUserIndexAccessor.class).toProvider(ExperimentUserIndexAccessorProvider.class).in(Singleton.class);
         bind(PageExperimentIndexAccessor.class).toProvider(PageExperimentIndexAccessorProvider.class).in(Singleton.class);
         bind(StateExperimentIndexAccessor.class).toProvider(StateExperimentIndexAccessorProvider.class).in(Singleton.class);
-        bind(UserAssignmentIndexAccessor.class).toProvider(UserAssignmentIndexAccessorProvider.class).in(Singleton.class);
         bind(UserBucketIndexAccessor.class).toProvider(UserBucketIndexAccessorProvider.class).in(Singleton.class);
         //Bind those audit
         bind(AuditLogAccessor.class).toProvider(AuditLogAccessorProvider.class).in(Singleton.class);

modules/repository-datastax/src/main/java/com/intuit/wasabi/repository/cassandra/accessor/index/ExperimentUserIndexAccessor.java

@@ -40,6 +40,9 @@ public interface ExperimentUserIndexAccessor {
     @Query("select * from experiment_user_index where user_id = ? and app_name = ? and context = ?")
     Result<ExperimentUserByUserIdContextAppNameExperimentId> selectBy(String userId, String appName, String context);
 
+    @Query("select * from experiment_user_index where user_id = ? and app_name = ? and context = ? and experiment_id = ?")
+    Result<ExperimentUserByUserIdContextAppNameExperimentId> selectBy(String userId, String appName, String context, UUID experimentId);
+
     @Query("delete from experiment_user_index where user_id = ? and experiment_id = ? and context = ? and app_name = ?")
     ResultSet deleteBy(String userId, UUID experimentId, String context, String appName);