Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EP-513-4: Remove Datalake Events And Worker #1236

Merged
merged 55 commits into from
May 7, 2021
Merged
Show file tree
Hide file tree
Changes from 53 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
8472597
removed lake event class
sunday-okpoluaefe May 4, 2021
3b4502a
removed koala events
sunday-okpoluaefe May 4, 2021
d2a3342
fixed failing test cases
sunday-okpoluaefe May 4, 2021
7928be0
fixed failing test cases
sunday-okpoluaefe May 4, 2021
b05626d
Replace lake tracker with segment
hadia May 4, 2021
89453fb
fix segment
hadia May 4, 2021
815e756
Remove koalaEvent
hadia May 4, 2021
77e2fa2
Remove CommentDialog ,ExternalLink,Update enums
hadia May 4, 2021
f6b29e8
fixed failing test cases
sunday-okpoluaefe May 4, 2021
a2d43ef
Merge branch 'sunday-ep-523-remove-datalake-evens' of github.com:kick…
sunday-okpoluaefe May 4, 2021
dfab46b
Remove Koala context
hadia May 4, 2021
63b016a
Revert "Remove CommentDialog ,ExternalLink,Update enums"
hadia May 4, 2021
70f284b
Merge branch 'sunday-ep-523-remove-datalake-evens' of github.com:kick…
sunday-okpoluaefe May 4, 2021
db3324a
Merge branch 'sunday-ep-523-remove-datalake-evens' of github.com:kick…
sunday-okpoluaefe May 4, 2021
8497f8e
Remove Koala context enums
hadia May 4, 2021
255ae9a
refactored viewmodels
sunday-okpoluaefe May 4, 2021
d0c5a04
refactored koalacontext class
sunday-okpoluaefe May 4, 2021
62239b1
removed laketests
sunday-okpoluaefe May 4, 2021
0599d6d
Merge remote-tracking branch 'origin/sunday-ep-523-remove-datalake-ev…
hadia May 4, 2021
96ae19d
Remove Dagger lake decencies
hadia May 4, 2021
7e210af
Refactor rename kolacontext and use only MessagePreviousScreenType enum
hadia May 5, 2021
7532fce
Merge branch 'hadia/remove_lake_depencies' into sunday-ep-523-remove-…
hadia May 5, 2021
8a7be1b
Clean code from commented unused lines
hadia May 5, 2021
4051663
Rename lake to analyticEvents events in base viewmodel
hadia May 5, 2021
2b124a0
refactor lake to analyticEvents in FragmentViewModel
hadia May 5, 2021
5d6ea88
removed lake events
sunday-okpoluaefe May 5, 2021
eee9709
removed lake events
sunday-okpoluaefe May 5, 2021
ac1395e
removed lake events
sunday-okpoluaefe May 5, 2021
c1f9881
removed lake events
sunday-okpoluaefe May 5, 2021
7d7ed15
removed lake events
sunday-okpoluaefe May 5, 2021
2f5e48e
removed lake events
sunday-okpoluaefe May 5, 2021
7f6538d
refactored segment test
sunday-okpoluaefe May 5, 2021
598d929
refactored segment test
sunday-okpoluaefe May 5, 2021
30daff7
fixed failing test cases
sunday-okpoluaefe May 5, 2021
634430e
fixed failing test cases
sunday-okpoluaefe May 5, 2021
c40c1c6
fixed failing test cases
sunday-okpoluaefe May 5, 2021
a769fff
fixed lint errors and merge conflicts
sunday-okpoluaefe May 5, 2021
160d55f
fixed lint errors and merge conflicts
sunday-okpoluaefe May 5, 2021
5b7f233
Merge branch 'master' into sunday-ep-523-remove-datalake-evens
hadia May 5, 2021
aeba822
removed unused methods
sunday-okpoluaefe May 6, 2021
a808cb0
Merge branch 'sunday-ep-523-remove-datalake-evens' of github.com:kick…
sunday-okpoluaefe May 6, 2021
f994b47
removed optimizely experiments
sunday-okpoluaefe May 6, 2021
0778c2f
removed unsused imports
sunday-okpoluaefe May 6, 2021
39277c1
removed unsused imports
sunday-okpoluaefe May 6, 2021
696ab17
Create unit test for messageThreadIntent
hadia May 6, 2021
80e5cb0
Create unit test for messageThreadIntent
hadia May 6, 2021
20f746a
fix ktlint format
hadia May 6, 2021
b091d96
Merge branch 'sunday-ep-523-remove-datalake-evens' of github.com:kick…
sunday-okpoluaefe May 6, 2021
f2b448b
removed unsused imports
sunday-okpoluaefe May 6, 2021
4d8d75e
removed unsused imports
sunday-okpoluaefe May 6, 2021
3d3bee3
fix the test
hadia May 6, 2021
d6247c6
fix format
hadia May 6, 2021
3473a2c
fix style
hadia May 6, 2021
2cde23b
Merge branch 'master' into sunday-ep-523-remove-datalake-evens
hadia May 7, 2021
72ca831
update the test
hadia May 7, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions app/src/main/java/com/kickstarter/ApplicationGraph.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.kickstarter.libs.Environment;
import com.kickstarter.libs.utils.ApplicationLifecycleUtil;
import com.kickstarter.services.LakeWorker;
import com.kickstarter.services.firebase.MessageService;
import com.kickstarter.services.firebase.RegisterTokenWorker;
import com.kickstarter.services.firebase.ResetDeviceIdWorker;
Expand All @@ -18,7 +17,6 @@ public interface ApplicationGraph {
void inject(IconTextView __);
void inject(KSWebView __);
void inject(KSApplication __);
void inject(LakeWorker __);
void inject(MessageService __);
void inject(RegisterTokenWorker __);
void inject(ResetDeviceIdWorker __);
Expand Down
38 changes: 2 additions & 36 deletions app/src/main/java/com/kickstarter/ApplicationModule.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import com.kickstarter.libs.KSCurrency;
import com.kickstarter.libs.KSString;
import com.kickstarter.libs.AnalyticEvents;
import com.kickstarter.libs.LakeTrackingClient;
import com.kickstarter.libs.Logout;
import com.kickstarter.libs.OptimizelyExperimentsClient;
import com.kickstarter.libs.PushNotifications;
Expand Down Expand Up @@ -63,9 +62,6 @@
import com.kickstarter.libs.qualifiers.ConfigPreference;
import com.kickstarter.libs.qualifiers.FirstSessionPreference;
import com.kickstarter.libs.qualifiers.GamesNewsletterPreference;
import com.kickstarter.libs.qualifiers.LakeEndpoint;
import com.kickstarter.libs.qualifiers.LakeRetrofit;
import com.kickstarter.libs.qualifiers.LakeTracker;
import com.kickstarter.libs.qualifiers.PackageNameString;
import com.kickstarter.libs.qualifiers.UserPreference;
import com.kickstarter.libs.qualifiers.WebEndpoint;
Expand All @@ -76,7 +72,6 @@
import com.kickstarter.services.ApiService;
import com.kickstarter.services.ApolloClientType;
import com.kickstarter.services.KSWebViewClient;
import com.kickstarter.services.LakeService;
import com.kickstarter.services.WebClient;
import com.kickstarter.services.WebClientType;
import com.kickstarter.services.WebService;
Expand Down Expand Up @@ -137,7 +132,7 @@ static Environment provideEnvironment(final @NonNull @ActivitySamplePreference I
final @NonNull InternalToolsType internalToolsType,
final @NonNull KSCurrency ksCurrency,
final @NonNull KSString ksString,
final @NonNull @LakeTracker AnalyticEvents analytics,
final @NonNull AnalyticEvents analytics,
final @NonNull Logout logout,
final @NonNull ExperimentsClientType optimizely,
final @NonNull PlayServicesCapability playServicesCapability,
Expand Down Expand Up @@ -253,16 +248,6 @@ static Retrofit provideApiRetrofit(final @NonNull ApiEndpoint apiEndpoint,
return createRetrofit(apiEndpoint.url(), gson, okHttpClient);
}

@Provides
@Singleton
@LakeRetrofit
@NonNull
static Retrofit provideLakeRetrofit(@NonNull @LakeEndpoint final String lakeEndpoint,
final @NonNull Gson gson,
final @NonNull OkHttpClient okHttpClient) {
return createRetrofit(lakeEndpoint, gson, okHttpClient);
}

@Provides
@Singleton
@NonNull
Expand All @@ -288,13 +273,6 @@ static ApiService provideApiService(final @ApiRetrofit @NonNull Retrofit retrofi
return retrofit.create(ApiService.class);
}

@Provides
@Singleton
@NonNull
static LakeService provideLakeService(final @LakeRetrofit @NonNull Retrofit retrofit) {
return retrofit.create(LakeService.class);
}

@Provides
@Singleton
static String provideClientId(final @NonNull ApiEndpoint apiEndpoint) {
Expand Down Expand Up @@ -432,7 +410,6 @@ SegmentTrackingClient provideSegmentTrackingClient(
}

@Provides
@LakeTracker
@Singleton
static AnalyticEvents provideAnalytics(
final @ApplicationContext @NonNull Context context,
Expand All @@ -441,8 +418,7 @@ static AnalyticEvents provideAnalytics(
final @NonNull CurrentConfigType currentConfig,
final @NonNull ExperimentsClientType experimentsClientType,
final @NonNull SegmentTrackingClient segmentClient) {
final LakeTrackingClient lakeTrackingClient = new LakeTrackingClient(context, currentUser, build, currentConfig, experimentsClientType);
final List<TrackingClientType> clients = Arrays.asList(lakeTrackingClient, segmentClient);
final List<TrackingClientType> clients = Arrays.asList(segmentClient);
return new AnalyticEvents(clients);
}

Expand Down Expand Up @@ -527,16 +503,6 @@ static String provideWebEndpoint(final @NonNull ApiEndpoint apiEndpoint) {
apiEndpoint.url().replaceAll("(?<=\\Ahttps?:\\/\\/)api.", "");
}

@Provides
@Singleton
@LakeEndpoint
@NonNull
static String provideLakeEndpoint(final @NonNull ApiEndpoint apiEndpoint) {
return (apiEndpoint == ApiEndpoint.PRODUCTION) ?
Secrets.LakeEndpoint.PRODUCTION :
Secrets.LakeEndpoint.STAGING;
}

@Provides
@Singleton
static Font provideFont(final @NonNull AssetManager assetManager) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/kickstarter/libs/ActivityViewModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ public class ActivityViewModel<ViewType extends ActivityLifecycleType> {
private final PublishSubject<ActivityResult> activityResult = PublishSubject.create();

private final PublishSubject<Intent> intent = PublishSubject.create();
protected final AnalyticEvents lake;
protected final AnalyticEvents analyticEvents;

public ActivityViewModel(final @NonNull Environment environment) {
this.lake = environment.analytics();
this.analyticEvents = environment.analytics();
}

/**
Expand Down
Loading