Basic types refactoring

Author: demdxx

admodels/ad_asset.go

@@ -0,0 +1,73 @@
+//
+// @project GeniusRabbit corelib 2018 - 2019
+// @author Dmitry Ponomarev <demdxx@gmail.com> 2018 - 2019
+//
+
+package admodels
+
+import (
+	"github.com/geniusrabbit/adcorelib/admodels/types"
+)
+
+// AdFileAssetThumb of the file
+type AdFileAssetThumb struct {
+	URL    string                `json:"url"`
+	Width  int                   `json:"w"`
+	Height int                   `json:"h"`
+	Type   types.AdFileAssetType `json:"type,omitempty"`
+}
+
+// IsSuits thumb by size
+func (th AdFileAssetThumb) IsSuits(w, h, wmin, hmin int) bool {
+	return th.Width <= w && th.Width >= wmin && th.Height <= h && th.Height >= hmin
+}
+
+// IsImage file type
+func (th *AdFileAssetThumb) IsImage() bool {
+	return th.Type.IsImage()
+}
+
+// IsVideo file type
+func (th *AdFileAssetThumb) IsVideo() bool {
+	return th.Type.IsVideo()
+}
+
+// AdFileAsset information
+type AdFileAsset struct {
+	ID          uint64                `json:"id,omitempty"`
+	Name        string                `json:"name,omitempty"` // Name of the asset, like "main", "banner", "icon", etc.
+	URL         string                `json:"url,omitempty"`  // In case of HTML5, hare must be the path to directory on CDN
+	Type        types.AdFileAssetType `json:"type,omitempty"`
+	ContentType string                `json:"content_type,omitempty"`
+	Width       int                   `json:"width,omitempty"`
+	Height      int                   `json:"height,omitempty"`
+	Thumbs      []AdFileAssetThumb
+}
+
+// ThumbBy size borders and specific type
+func (f *AdFileAsset) ThumbBy(w, h, wmin, hmin int) (th *AdFileAssetThumb) {
+	if w <= 0 {
+		w = 0x0fffffff
+	}
+	if h <= 0 {
+		h = 0x0fffffff
+	}
+	for i := 0; i < len(f.Thumbs); i++ {
+		if f.Thumbs[i].IsSuits(w, h, wmin, hmin) {
+			if th == nil || th.Width > f.Thumbs[i].Width {
+				th = &f.Thumbs[i]
+			}
+		}
+	}
+	return th
+}
+
+// IsImage file type
+func (f *AdFileAsset) IsImage() bool {
+	return f.Type.IsImage()
+}
+
+// IsVideo file type
+func (f *AdFileAsset) IsVideo() bool {
+	return f.Type.IsVideo()
+}

admodels/ad_file_asset.go

@@ -4,16 +4,16 @@ import (
 	"github.com/geniusrabbit/adcorelib/admodels/types"
 )
 
-// AdAssets contains the list of file assets
-type AdAssets []*AdAsset
+// AdFileAssets contains the list of file assets
+type AdFileAssets []*AdFileAsset
 
 // Main asset of the list
-func (assets AdAssets) Main() *AdAsset {
+func (assets AdFileAssets) Main() *AdFileAsset {
 	return assets.Asset(types.FormatAssetMain)
 }
 
 // Asset by name
-func (assets AdAssets) Asset(name string) *AdAsset {
+func (assets AdFileAssets) Asset(name string) *AdFileAsset {
 	isMain := name == types.FormatAssetMain
 	for _, it := range assets {
 		if (isMain && (it.Name == "" || it.Name == types.FormatAssetMain)) || it.Name == name {
@@ -23,18 +23,8 @@ func (assets AdAssets) Asset(name string) *AdAsset {
 	return nil
 }
 
-// AssetByID returns asset with specific ID
-func (assets AdAssets) AssetByID(id uint64) *AdAsset {
-	for _, it := range assets {
-		if it.ID == id {
-			return it
-		}
-	}
-	return nil
-}
-
-// AssetBaner by fixed size
-func (assets AdAssets) AssetBanner(w, h int) *AdAsset {
+// AssetBanner by fixed size
+func (assets AdFileAssets) AssetBanner(w, h int) *AdFileAsset {
 	for i, it := range assets {
 		if it.Name == types.FormatAssetBanner && it.Width == w && it.Height == h {
 			return assets[i]
@@ -44,6 +34,6 @@ func (assets AdAssets) AssetBanner(w, h int) *AdAsset {
 }
 
 // Len of the assets list
-func (assets AdAssets) Len() int {
+func (assets AdFileAssets) Len() int {
 	return len(assets)
 }

admodels/ad_assets.go admodels/ad_file_assets.goadmodels/ad_assets.go renamed to admodels/ad_file_assets.go

@@ -72,7 +72,7 @@ func RTBSourceFromModel(cl *models.RTBSource, acc *Account) (src *RTBSource) {
 
 	filter := types.BaseFilter{
 		Secure:          int8(cl.Secure),
-		Adblock:         int8(cl.AdBlock),
+		AdBlock:         int8(cl.AdBlock),
 		PrivateBrowsing: int8(cl.PrivateBrowsing),
 		IP:              int8(cl.IP),
 	}
@@ -130,3 +130,8 @@ func (s *RTBSource) TestFormat(f *types.Format) bool {
 func (s *RTBSource) PriceCorrectionReduceFactor() float64 {
 	return s.PriceCorrectionReduce
 }
+
+// Weight of the source for ad selection
+func (s *RTBSource) Weight() float64 {
+	return s.MinimalWeight
+}