github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-04 16:05:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use WLUser to provide default name and email

Browse source
This commit is contained in:
Marc Egea i Sala 2015-09-29 11:36:10 +01:00
parent 61a5c5870c
commit 8648f8bde7
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/getdoc/GetDocResult.java
View file

@ -5,6 +5,7 @@ import com.google.gson.JsonObject;
import uk.ac.ic.wlgitbridge.snapshot.base.Result;
import uk.ac.ic.wlgitbridge.snapshot.exception.FailedConnectionException;
import uk.ac.ic.wlgitbridge.snapshot.getdoc.exception.InvalidProjectException;
import uk.ac.ic.wlgitbridge.snapshot.getsavedvers.WLUser;
import uk.ac.ic.wlgitbridge.snapshot.push.exception.SnapshotPostException;
import uk.ac.ic.wlgitbridge.snapshot.base.Request;
import uk.ac.ic.wlgitbridge.snapshot.getdoc.exception.ProtectedProjectException;
@ -17,8 +18,7 @@ public class GetDocResult extends Result {
private int error;
private int versionID;
private String createdAt;
private String name;
private String email;
private WLUser user;
private SnapshotPostException exception;
@ -34,8 +34,7 @@ public class GetDocResult extends Result {
}
this.versionID = versionID;
this.createdAt = createdAt;
this.name = name;
this.email = email;
this.user = new WLUser(name, email);
}
@Override
@ -45,8 +44,8 @@ public class GetDocResult extends Result {
jsonThis.addProperty("latestVerId", versionID);
jsonThis.addProperty("latestVerAt", createdAt);
JsonObject latestVerBy = new JsonObject();
latestVerBy.addProperty("email", email);
latestVerBy.addProperty("name", name);
latestVerBy.addProperty("email", getEmail());
latestVerBy.addProperty("name", getName());
jsonThis.add("latestVerBy", latestVerBy);
} else {
jsonThis.addProperty("status", error);
@ -78,15 +77,17 @@ public class GetDocResult extends Result {
} else {
versionID = jsonObject.get("latestVerId").getAsInt();
createdAt = jsonObject.get("latestVerAt").getAsString();
String name = null;
String email = null;
JsonElement latestVerBy = jsonObject.get("latestVerBy");
if (latestVerBy.isJsonObject()) {
JsonObject userObject = latestVerBy.getAsJsonObject();
name = userObject.get("name").getAsString();
email = userObject.get("email").getAsString();
} else {
name = "Anonymous";
email = "anonymous@overleaf.com";
}
user = new WLUser(name, email);
}
}
@ -102,11 +103,11 @@ public class GetDocResult extends Result {
}
public String getName() {
return name;
return user.getName();
}
public String getEmail() {
return email;
return user.getEmail();
}
}

11
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/getsavedvers/WLUser.java
View file

@ -11,12 +11,17 @@ public class WLUser {
private final String email;
public WLUser() {
this("Anonymous", "anonymous@" + Util.getServiceName().toLowerCase() + ".com");
this(null, null);
}
public WLUser(String name, String email) {
this.name = name;
this.email = email;
if (name != null && email != null) {
this.name = name;
this.email = email;
} else {
this.name = "Anonymous";
this.email = "anonymous@" + Util.getServiceName().toLowerCase() + ".com";
}
}
public String getName() {