Refactored code for performance and readability
This commit is contained in:
parent
ec83d01dca
commit
ef04e156fd
|
@ -1,58 +1,39 @@
|
|||
package com.twitter.follow_recommendations.common.clients.geoduck
|
||||
|
||||
import com.twitter.finagle.stats.StatsReceiver
|
||||
import com.twitter.follow_recommendations.common.models.GeohashAndCountryCode
|
||||
import com.twitter.stitch.Stitch
|
||||
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Singleton
|
||||
import javax.inject.{Inject, Singleton}
|
||||
|
||||
@Singleton
|
||||
class UserLocationFetcher @Inject() (
|
||||
locationServiceClient: LocationServiceClient,
|
||||
reverseGeocodeClient: ReverseGeocodeClient,
|
||||
statsReceiver: StatsReceiver) {
|
||||
private val stats = statsReceiver.scope("user_location_fetcher")
|
||||
|
||||
private val stats: StatsReceiver = statsReceiver.scope("user_location_fetcher")
|
||||
private val totalRequestsCounter = stats.counter("requests")
|
||||
private val emptyResponsesCounter = stats.counter("empty")
|
||||
private val locationServiceExceptionCounter = stats.counter("location_service_exception")
|
||||
private val reverseGeocodeExceptionCounter = stats.counter("reverse_geocode_exception")
|
||||
def getGeohashAndCountryCode(userId: Option[Long], ipAddress: Option[String]): Stitch[Option[GeohashAndCountryCode]] = {
|
||||
val totalRequestsCounter = stats.counter("requests").incr()
|
||||
|
||||
def getGeohashAndCountryCode(
|
||||
userId: Option[Long],
|
||||
ipAddress: Option[String]
|
||||
): Stitch[Option[GeohashAndCountryCode]] = {
|
||||
totalRequestsCounter.incr()
|
||||
val lscLocationStitch = Stitch
|
||||
.collect {
|
||||
userId.map(locationServiceClient.getGeohashAndCountryCode)
|
||||
}.rescue {
|
||||
case _: Exception =>
|
||||
locationServiceExceptionCounter.incr()
|
||||
Stitch.None
|
||||
}
|
||||
val lscLocationStitch = Stitch.collect(userId.map(locationServiceClient.getGeohashAndCountryCode)).rescue {
|
||||
case _: Exception =>
|
||||
stats.counter("location_service_exception").incr()
|
||||
Stitch.None
|
||||
}
|
||||
|
||||
val ipLocationStitch = Stitch
|
||||
.collect {
|
||||
ipAddress.map(reverseGeocodeClient.getGeohashAndCountryCode)
|
||||
}.rescue {
|
||||
case _: Exception =>
|
||||
reverseGeocodeExceptionCounter.incr()
|
||||
Stitch.None
|
||||
}
|
||||
val ipLocationStitch = Stitch.collect(ipAddress.map(reverseGeocodeClient.getGeohashAndCountryCode)).rescue {
|
||||
case _: Exception =>
|
||||
stats.counter("reverse_geocode_exception").incr()
|
||||
Stitch.None
|
||||
}
|
||||
|
||||
Stitch.join(lscLocationStitch, ipLocationStitch).map {
|
||||
case (lscLocation, ipLocation) => {
|
||||
val geohash = lscLocation.flatMap(_.geohash).orElse(ipLocation.flatMap(_.geohash))
|
||||
val countryCode =
|
||||
lscLocation.flatMap(_.countryCode).orElse(ipLocation.flatMap(_.countryCode))
|
||||
(geohash, countryCode) match {
|
||||
case (None, None) =>
|
||||
emptyResponsesCounter.incr()
|
||||
case (lscLocation, ipLocation) =>
|
||||
(lscLocation.flatMap(_.geohash).orElse(ipLocation.flatMap(_.geohash)),
|
||||
lscLocation.flatMap(_.countryCode).orElse(ipLocation.flatMap(_.countryCode))) match {
|
||||
case (Some(geohash), Some(countryCode)) =>
|
||||
Some(GeohashAndCountryCode(geohash, countryCode))
|
||||
case _ =>
|
||||
stats.counter("empty").incr()
|
||||
None
|
||||
case _ => Some(GeohashAndCountryCode(geohash, countryCode))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue