badjware
/
the-algorithm
mirror of https://github.com/twitter/the-algorithm.git
1
0
Fork 0
Code Releases Activity

Refactored code for performance and readability

This commit is contained in:
William Woods 2023-04-03 04:26:18 +00:00
parent ec83d01dca
commit ef04e156fd
1 changed files with 21 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
follow-recommendations-service/common/src/main/scala/com/twitter/follow_recommendations/common/clients/geoduck/UserLocationFetcher.scala
View File

@ -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.follow_recommendations.common.models.GeohashAndCountryCode
import com.twitter.stitch.Stitch import com.twitter.stitch.Stitch
import javax.inject.Inject import javax.inject.{Inject, Singleton}
import javax.inject.Singleton
@Singleton @Singleton
class UserLocationFetcher @Inject() ( class UserLocationFetcher @Inject() (
locationServiceClient: LocationServiceClient, locationServiceClient: LocationServiceClient,
reverseGeocodeClient: ReverseGeocodeClient, reverseGeocodeClient: ReverseGeocodeClient,
statsReceiver: StatsReceiver) { statsReceiver: StatsReceiver) {
private val stats = statsReceiver.scope("user_location_fetcher")
private val stats: StatsReceiver = statsReceiver.scope("user_location_fetcher") def getGeohashAndCountryCode(userId: Option[Long], ipAddress: Option[String]): Stitch[Option[GeohashAndCountryCode]] = {
private val totalRequestsCounter = stats.counter("requests") val totalRequestsCounter = stats.counter("requests").incr()
private val emptyResponsesCounter = stats.counter("empty")
private val locationServiceExceptionCounter = stats.counter("location_service_exception")
private val reverseGeocodeExceptionCounter = stats.counter("reverse_geocode_exception")
def getGeohashAndCountryCode( val lscLocationStitch = Stitch.collect(userId.map(locationServiceClient.getGeohashAndCountryCode)).rescue {
userId: Option[Long],
ipAddress: Option[String]
): Stitch[Option[GeohashAndCountryCode]] = {
totalRequestsCounter.incr()
val lscLocationStitch = Stitch
.collect {
userId.map(locationServiceClient.getGeohashAndCountryCode)
}.rescue {
case _: Exception => case _: Exception =>
locationServiceExceptionCounter.incr() stats.counter("location_service_exception").incr()
Stitch.None Stitch.None
} }
val ipLocationStitch = Stitch val ipLocationStitch = Stitch.collect(ipAddress.map(reverseGeocodeClient.getGeohashAndCountryCode)).rescue {
.collect {
ipAddress.map(reverseGeocodeClient.getGeohashAndCountryCode)
}.rescue {
case _: Exception => case _: Exception =>
reverseGeocodeExceptionCounter.incr() stats.counter("reverse_geocode_exception").incr()
Stitch.None Stitch.None
} }
Stitch.join(lscLocationStitch, ipLocationStitch).map { Stitch.join(lscLocationStitch, ipLocationStitch).map {
case (lscLocation, ipLocation) => { case (lscLocation, ipLocation) =>
val geohash = lscLocation.flatMap(_.geohash).orElse(ipLocation.flatMap(_.geohash)) (lscLocation.flatMap(_.geohash).orElse(ipLocation.flatMap(_.geohash)),
val countryCode = lscLocation.flatMap(_.countryCode).orElse(ipLocation.flatMap(_.countryCode))) match {
lscLocation.flatMap(_.countryCode).orElse(ipLocation.flatMap(_.countryCode)) case (Some(geohash), Some(countryCode)) =>
(geohash, countryCode) match { Some(GeohashAndCountryCode(geohash, countryCode))
case (None, None) => case _ =>
emptyResponsesCounter.incr() stats.counter("empty").incr()
None None
case _ => Some(GeohashAndCountryCode(geohash, countryCode))
}
} }
} }
} }