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

Story6 #118

Merged
merged 4 commits into from Mar 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -10,7 +10,10 @@
import android.view.View;
import android.widget.EditText;

import com.example.cse110_team16_project.Database.SCLocationDatabase;
import com.example.cse110_team16_project.Database.SCLocationRepository;
import com.example.cse110_team16_project.classes.Constants;
import com.example.cse110_team16_project.classes.SCLocation;

import java.util.UUID;

Expand Down Expand Up @@ -39,7 +42,10 @@ public void onSubmitClicked(View view) {

Log.d("ADDNAME", "name is " + name + ".");
Log.d("ADDNAME", "private code is " + private_code + ".");

SCLocationRepository repo = new SCLocationRepository(SCLocationDatabase.
provide(this).getDao());
SCLocation newUser = new SCLocation(name,public_code);
repo.upsertRemote(newUser,private_code);
startActivity(new Intent(this, UIDActivity.class));
}
}
Expand Up @@ -19,13 +19,16 @@
import android.os.Bundle;
import android.view.View;

import com.example.cse110_team16_project.Database.SCLocationDatabase;
import com.example.cse110_team16_project.Database.SCLocationRepository;
import com.example.cse110_team16_project.classes.CompassUIManager;
import com.example.cse110_team16_project.classes.CompassViewModel;
import com.example.cse110_team16_project.classes.Constants;
import com.example.cse110_team16_project.classes.Coordinates;
import com.example.cse110_team16_project.Units.Degrees;
import com.example.cse110_team16_project.classes.SCLocation;
import com.example.cse110_team16_project.classes.DeviceTracker;
import com.example.cse110_team16_project.classes.UserLocationSynch;


import java.util.concurrent.ExecutorService;
Expand All @@ -41,6 +44,10 @@ public class CompassActivity extends AppCompatActivity {
private CompassUIManager compassUIManager;
private CompassViewModel viewModel;

private UserLocationSynch locationSyncer;

private SCLocationRepository repo;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand All @@ -52,11 +59,16 @@ protected void onCreate(Bundle savedInstanceState) {
}

private void finishOnCreate(){

repo = new SCLocationRepository(SCLocationDatabase.
provide(this).getDao());
loadUserInfo();

viewModel = setupViewModel();
deviceTracker = new DeviceTracker(this);
compassUIManager = new CompassUIManager(this, deviceTracker.getOrientation(), findViewById(R.id.compassRing));
locationSyncer = new UserLocationSynch(deviceTracker.getCoordinates(),
new SCLocation(userLabel,public_code),private_code, this, repo);
compassUIManager = new CompassUIManager(this, deviceTracker.getOrientation(),
findViewById(R.id.compassRing));
}


Expand Down
Expand Up @@ -112,7 +112,7 @@ public void patchSCLocation(SCLocation scLocation, String private_code, boolean

var request = new Request.Builder()
.url(url + public_code)
.method("PUT", requestBody)
.method("PATCH", requestBody)
.build();

try (var response = client.newCall(request).execute()) {
Expand Down
Expand Up @@ -37,6 +37,7 @@ public static Instant StringToInstant(String str){
}

public static Coordinates LocationToCoordinates(Location location){
if (location == null) return null;
return new Coordinates(location.getLatitude(),location.getLongitude());
}

Expand Down
Expand Up @@ -25,7 +25,7 @@ public class DeviceTracker {
private final LocationService locationService;
private final OrientationService orientationService;

private final MutableLiveData<Coordinates> coordinates = new MutableLiveData<>();
private final MutableLiveData<Coordinates> coordinates = new MutableLiveData<>(null);

public DeviceTracker(Activity activity){
this(activity, LocationService.singleton(activity,UPDATE_TIME, UPDATE_MIN_METERS),
Expand All @@ -39,7 +39,8 @@ public DeviceTracker(Activity activity, LocationService locationService,
this.orientationService = orientationService;

getLocation().observe((LifecycleOwner) activity, location -> {
coordinates.postValue(Converters.LocationToCoordinates(location));
Coordinates newCoords = Converters.LocationToCoordinates(location);
if(newCoords != null) coordinates.postValue(newCoords);
});
}

Expand Down
@@ -0,0 +1,30 @@
package com.example.cse110_team16_project.classes;

import android.app.Activity;

import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;

import com.example.cse110_team16_project.Database.SCLocationRepository;

public class UserLocationSynch {
SCLocation location;
MutableLiveData<SCLocation> locationLive = new MutableLiveData<SCLocation>(null);

public UserLocationSynch(LiveData<Coordinates> userCoords, SCLocation user, String private_code,
Activity activity, SCLocationRepository repo){

location = user;
repo.updateSCLocationLive(locationLive,private_code);
userCoords.observe((LifecycleOwner) activity,(potentialNullCoords) -> {
if(potentialNullCoords != null) {
userCoords.removeObservers((LifecycleOwner) activity);
userCoords.observe((LifecycleOwner) activity, (coords) -> {
location.setCoordinates(coords);
locationLive.postValue(location);
});
}
});
}
}
@@ -0,0 +1,78 @@
package com.example.cse110_team16_project;

import static org.junit.Assert.assertEquals;

import android.content.Context;

import androidx.arch.core.executor.testing.InstantTaskExecutorRule;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import androidx.room.Room;
import androidx.test.core.app.ActivityScenario;
import androidx.test.core.app.ApplicationProvider;

import com.example.cse110_team16_project.Database.SCLocationDao;
import com.example.cse110_team16_project.Database.SCLocationDatabase;
import com.example.cse110_team16_project.Database.SCLocationRepository;
import com.example.cse110_team16_project.classes.Coordinates;
import com.example.cse110_team16_project.classes.SCLocation;
import com.example.cse110_team16_project.classes.UserLocationSynch;

import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;

import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;

@RunWith(RobolectricTestRunner.class)
public class UserLocationSynchTest {
private SCLocationDao dao;
private SCLocationDatabase db;

@Rule
public InstantTaskExecutorRule instantTaskExecutorRule = new InstantTaskExecutorRule();

@Before
public void createDb(){
Context context = ApplicationProvider.getApplicationContext();
db = Room.inMemoryDatabaseBuilder(context, SCLocationDatabase.class)
.allowMainThreadQueries()
.build();
dao = db.getDao();
}

@After
public void closeDb() throws Exception {
db.close();
}

@Test
public void Story6Scenario1Test(){
var scenario = ActivityScenario.launch(CompassActivity.class);
scenario.moveToState(Lifecycle.State.STARTED);
scenario.onActivity(activity -> {
SCLocationRepository repository = new SCLocationRepository(dao);
String label = "Mom";
String code = "wadadawdabdbawbdwadawdwada";
Coordinates coords = new Coordinates(2,2);
MutableLiveData<Coordinates> liveCoordinates = new MutableLiveData<>(null);
UserLocationSynch syncher = new UserLocationSynch(liveCoordinates,
new SCLocation(label,code),code,activity,repository);
liveCoordinates.postValue(coords);
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
SCLocation updatedLocation = repository.getRemote(code);
assertEquals(2,updatedLocation.getLatitude(),0.01);
assertEquals(2,updatedLocation.getLongitude(),0.01);

});
}
}