From 8b94c9dee5631985726099e3978ca45b9080c947 Mon Sep 17 00:00:00 2001
From: AdGeneration <ssp-ope@scaleout.jp>
Date: Tue, 7 Apr 2020 17:54:18 +0900
Subject: [PATCH] =?UTF-8?q?usersync=E3=81=AE=E5=89=8A=E9=99=A4=20dealId?=
 =?UTF-8?q?=E3=81=AE=E9=81=A9=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adapters/adgeneration/adgeneration.go         | 16 ++++++------
 .../exemplary/single-banner.json              |  4 ++-
 adapters/adgeneration/usersync.go             | 12 ---------
 adapters/adgeneration/usersync_test.go        | 25 -------------------
 config/config.go                              |  2 --
 usersync/usersyncers/syncer.go                |  2 --
 usersync/usersyncers/syncer_test.go           |  9 ++++---
 7 files changed, 17 insertions(+), 53 deletions(-)
 delete mode 100644 adapters/adgeneration/usersync.go
 delete mode 100644 adapters/adgeneration/usersync_test.go

diff --git a/adapters/adgeneration/adgeneration.go b/adapters/adgeneration/adgeneration.go
index 3ad629e0cee..4d27ec4fb07 100644
--- a/adapters/adgeneration/adgeneration.go
+++ b/adapters/adgeneration/adgeneration.go
@@ -31,6 +31,7 @@ type adgServerResponse struct {
 	Beacon     string  `json:"beacon"`
 	Beaconurl  string  `json:"beaconurl"`
 	Cpm        float64 `jsons:"cpm"`
+	Dealid     string  `json:"dealid"`
 	Creativeid string  `json:"creativeid"`
 	H          uint64  `json:"h"`
 	W          uint64  `json:"w"`
@@ -208,13 +209,14 @@ func (adg *AdgenerationAdapter) MakeBids(internalRequest *openrtb.BidRequest, ex
 		bitType = openrtb_ext.BidTypeBanner
 		adm = adg.createAd(&result, impId)
 		bid := openrtb.Bid{
-			ID:    bidResp.Locationid,
-			ImpID: impId,
-			AdM:   adm,
-			Price: result.Cpm,
-			W:     result.W,
-			H:     result.H,
-			CrID:  result.Creativeid,
+			ID:     bidResp.Locationid,
+			ImpID:  impId,
+			AdM:    adm,
+			Price:  result.Cpm,
+			W:      result.W,
+			H:      result.H,
+			CrID:   result.Creativeid,
+			DealID: result.Dealid,
 		}
 
 		bidResponse.Bids = append(bidResponse.Bids, &adapters.TypedBid{
diff --git a/adapters/adgeneration/adgenerationtest/exemplary/single-banner.json b/adapters/adgeneration/adgenerationtest/exemplary/single-banner.json
index 1025d5f2fda..9ea5584101b 100644
--- a/adapters/adgeneration/adgenerationtest/exemplary/single-banner.json
+++ b/adapters/adgeneration/adgenerationtest/exemplary/single-banner.json
@@ -103,6 +103,7 @@
                             },
                             "ttl": 10,
                             "w": 300,
+                            "dealid": "test-deal-id",
                             "weight": 1
                         }
                     ],
@@ -138,7 +139,8 @@
                 "adm": "<div id=\"medibasspContainer\">\n      <iframe src=\"https:\/\/s3-ap-northeast-1.amazonaws.com\/sdk-temp\/adg-sample-ad\/300x250.html?prc=-Cuepak&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDXY2hzbT0xOTgsZmJkZGMyNWEvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTg1MjEyMDg1Nzg5O3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16RGFfYVY0O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTA5LjQzMDAwMDAwMDAwMDAxO2NyeTJkPTAuMDA5MTM4MjYxOTAyNTg2MTI3MztpZHg9MDulc2VxaWTaACQ0NzFhM2JlNS1lYTQzLWRhZjAtYjhjZi1mNjJkNTA1N2Y5ZWOnc2VxdGltZa0xNTg1MjEyMDg1Nzg5pHh1aWS4WE52SVNNQ281bUlBQU1hN2dOUUFBQUFB%2Fp%2Fctsv%3Dm-ad226%3Bseqid%3D471a3be5-ea43-daf0-b8cf-f62d5057f9ec%3B%2Fg%2FU%3A%3Furl%3D\" style=\"border: 0px;\" width=\"300\" height=\"250\" frameborder=\"0\" scrolling=\"no\"><\/iframe>\n    <\/div>\n  <img src=\"https://tg.socdm.com/bc/v3?b=beaconID&amp;xuid=XUID&amp;ctsv=CTSV&amp;seqid=SeqID&amp;seqtime=SeqTime&amp;seqctx=SeqCtx&amp;t=.gif\" width=\"1\" height=\"1\" style=\"display:none;border:none;padding:0;margin:0;width:1px;height:1px\"/>",
                 "crid": "DummyDsp_SdkTeam_supership.jp",
                 "w": 300,
-                "h": 250
+                "h": 250,
+                "dealid": "test-deal-id"
               },
               "type": "banner"
             }
diff --git a/adapters/adgeneration/usersync.go b/adapters/adgeneration/usersync.go
deleted file mode 100644
index 844c33da649..00000000000
--- a/adapters/adgeneration/usersync.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package adgeneration
-
-import (
-	"text/template"
-
-	"github.com/prebid/prebid-server/adapters"
-	"github.com/prebid/prebid-server/usersync"
-)
-
-func NewAdgenerationSyncer(temp *template.Template) usersync.Usersyncer {
-	return adapters.NewSyncer("adgeneration", 0, temp, adapters.SyncTypeRedirect)
-}
diff --git a/adapters/adgeneration/usersync_test.go b/adapters/adgeneration/usersync_test.go
deleted file mode 100644
index 48126ea08f6..00000000000
--- a/adapters/adgeneration/usersync_test.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package adgeneration
-
-import (
-	"testing"
-	"text/template"
-
-	"github.com/prebid/prebid-server/privacy"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestNewAdgenerationSyncer(t *testing.T) {
-	syncURL := "https://tg.socdm.com/aux/idsync?proto=somedsp&ssp_uid=uid&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}"
-	syncURLTemplate := template.Must(
-		template.New("sync-template").Parse(syncURL),
-	)
-
-	syncer := NewAdgenerationSyncer(syncURLTemplate)
-	syncInfo, err := syncer.GetUsersyncInfo(privacy.Policies{})
-
-	assert.NoError(t, err)
-	assert.Equal(t, "https://tg.socdm.com/aux/idsync?proto=somedsp&ssp_uid=uid&gdpr=&gdpr_consent=", syncInfo.URL)
-	assert.Equal(t, "redirect", syncInfo.Type)
-	assert.EqualValues(t, 0, syncer.GDPRVendorID())
-	assert.False(t, syncInfo.SupportCORS)
-}
diff --git a/config/config.go b/config/config.go
index e04bb0d859d..11f767d69ce 100644
--- a/config/config.go
+++ b/config/config.go
@@ -487,8 +487,6 @@ func (cfg *Configuration) setDerivedDefaults() {
 	externalURL := cfg.ExternalURL
 	setDefaultUsersync(cfg.Adapters, openrtb_ext.Bidder33Across, "https://ic.tynt.com/r/d?m=xch&rt=html&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&ru="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3D33across%26uid%3D33XUSERID33X&id=zzz000000000002zzz")
 	setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderAdform, "https://cm.adform.net/cookie?redirect_url="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dadform%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%24UID")
-	//TODO: ここのUserSyncをどうするか調べる
-	// setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderAdgeneration, "https://tg.socdm.com/aux/idsync?proto=&ssp_uid=")
 	setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderAdkernel, "https://sync.adkernel.com/user-sync?t=image&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dadkernel%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7BUID%7D")
 	setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderAdkernelAdn, "https://tag.adkernel.com/syncr?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3DadkernelAdn%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7BUID%7D")
 	setDefaultUsersync(cfg.Adapters, openrtb_ext.BidderAdpone, "https://usersync.adpone.com/csync?redir="+url.QueryEscape(externalURL)+"%2Fsetuid%3Fbidder%3Dadpone%26gdpr%3D{{.GDPR}}%26gdpr_consent%3D{{.GDPRConsent}}%26uid%3D%7Buid%7D")
diff --git a/usersync/usersyncers/syncer.go b/usersync/usersyncers/syncer.go
index 83735ee5ae9..5447cd28800 100644
--- a/usersync/usersyncers/syncer.go
+++ b/usersync/usersyncers/syncer.go
@@ -9,7 +9,6 @@ import (
 	"github.com/golang/glog"
 	ttx "github.com/prebid/prebid-server/adapters/33across"
 	"github.com/prebid/prebid-server/adapters/adform"
-	"github.com/prebid/prebid-server/adapters/adgeneration"
 	"github.com/prebid/prebid-server/adapters/adkernel"
 	"github.com/prebid/prebid-server/adapters/adkernelAdn"
 	"github.com/prebid/prebid-server/adapters/adtelligent"
@@ -67,7 +66,6 @@ func NewSyncerMap(cfg *config.Configuration) map[openrtb_ext.BidderName]usersync
 
 	insertIntoMap(cfg, syncers, openrtb_ext.Bidder33Across, ttx.New33AcrossSyncer)
 	insertIntoMap(cfg, syncers, openrtb_ext.BidderAdform, adform.NewAdformSyncer)
-	insertIntoMap(cfg, syncers, openrtb_ext.BidderAdgeneration, adgeneration.NewAdgenerationSyncer)
 	insertIntoMap(cfg, syncers, openrtb_ext.BidderAdkernel, adkernel.NewAdkernelSyncer)
 	insertIntoMap(cfg, syncers, openrtb_ext.BidderAdkernelAdn, adkernelAdn.NewAdkernelAdnSyncer)
 	insertIntoMap(cfg, syncers, openrtb_ext.BidderAdpone, adpone.NewadponeSyncer)
diff --git a/usersync/usersyncers/syncer_test.go b/usersync/usersyncers/syncer_test.go
index 1cbe2d64137..d934379bc6b 100644
--- a/usersync/usersyncers/syncer_test.go
+++ b/usersync/usersyncers/syncer_test.go
@@ -66,10 +66,11 @@ func TestNewSyncerMap(t *testing.T) {
 	}
 
 	adaptersWithoutSyncers := map[openrtb_ext.BidderName]bool{
-		openrtb_ext.BidderApplogy:   true,
-		openrtb_ext.BidderTappx:     true,
-		openrtb_ext.BidderKubient:   true,
-		openrtb_ext.BidderPubnative: true,
+		openrtb_ext.BidderApplogy:      true,
+		openrtb_ext.BidderTappx:        true,
+		openrtb_ext.BidderKubient:      true,
+		openrtb_ext.BidderPubnative:    true,
+		openrtb_ext.BidderAdgeneration: true,
 	}
 
 	for bidder, config := range cfg.Adapters {