sportdb-sync 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 348a66cb30ccc072d2f6e0a82f61af6234e193d2
-  data.tar.gz: cae64f1ab5a09c9b0cd930d49a62f4b3a565eceb
+  metadata.gz: 415893e89d2c9d1a8dfa9b493ecff8452095f94f
+  data.tar.gz: 9e55c19b40ee247d6b3b9e286b9dc799fe95c5d7
 SHA512:
-  metadata.gz: a864409290725d1ed3d6cf529ae7bf30c6091f28e76ce01fe427b1ff0cf31349d049a07e7de39c599f8e8db1b0136c2e2d7e1750aac1eab90b43e78a4153d4b4
-  data.tar.gz: b28d7dd3b5202cb3d58e1afb7e24c21f45e6b74c19391717257e16332c93470f17a78810314252bd4ce24758bc50af1d6d533ccbc41d712bb6d1282943533797
+  metadata.gz: 4e4487b6d40e296e9de680f99cb331693ccff0aac5dc3d73a55cae418f6ba9410966da1542bfa090fefa3e60123ab5822745041ab132d0876e7d89fa44ae7da7
+  data.tar.gz: b59e3712eb51503aee9cc7c56c604fd8c5b0513a75995b7ceefe383f67820cd25ab17f97bd32f1ca6e0dfdacab49f4333eaa5b6af82102198714f7429d0b9ea9

data/lib/sportdb/sync/sync.rb

@@ -66,11 +66,18 @@ module SportDb
     def self.find_or_create( round, event: )
        rec = Model::Round.find_by( title: round.title, event_id: event.id )
        if rec.nil?
+         ## find last pos - check if it can be nil?
+         max_pos = Model::Round.where( event_id: event.id ).maximum( 'pos' )
+         max_pos = max_pos ? max_pos+1 : 1
+
          attribs = { event_id: event.id,
                      title:    round.title,
-                     pos:      round.pos,
-                     start_at: event.start_at.to_date
+                     pos:      max_pos
                    }
+
+         ## todo/fix:  check if round has (optional) start or end date and add!!!
+         ## attribs[ :start_at] = round.start_at.to_date
+
          rec = Model::Round.create!( attribs )
        end
        rec
@@ -82,10 +89,16 @@ module SportDb
     def self.find_or_create( group, event: )
        rec = Model::Group.find_by( title: group.title, event_id: event.id )
        if rec.nil?
+         ## find last pos - check if it can be nil?
+         max_pos = Model::Group.where( event_id: event.id ).maximum( 'pos' )
+         max_pos = max_pos ? max_pos+1 : 1
+
          attribs = { event_id: event.id,
                      title:    group.title,
-                     pos:      group.pos
+                     pos:      max_pos
                    }
+
+         ## todo/fix: check/add optional group key (was: pos before)!!!!
          rec = Model::Group.create!( attribs )
        end
        ## todo/fix: add/update teams in group too!!!!!
@@ -159,10 +172,15 @@ module SportDb
                                   team1_id: team1_rec.id,
                                   team2_id: team2_rec.id )
        if rec.nil?
-         attribs = { round_id: round_rec.id,
+        ## find last pos - check if it can be nil?
+         max_pos = Model::Game.where( event_id: event.id ).maximum( 'pos' )
+         max_pos = max_pos ? max_pos+1 : 1
+
+         attribs = { event_id: event.id,          ## todo/fix: change to data struct too?
+                     round_id: round_rec.id,
                      team1_id: team1_rec.id,
                      team2_id: team2_rec.id,
-                     pos:      999,    ## make optional why? why not? - change to num?
+                     pos:      max_pos,
                      play_at:  match.date.to_date,
                      score1:   match.score1,
                      score2:   match.score2,

data/lib/sportdb/sync/version.rb

@@ -7,7 +7,7 @@ module Sync
 
   MAJOR = 1    ## todo: namespace inside version or something - why? why not??
   MINOR = 0
-  PATCH = 1
+  PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/sportdb/sync.rb

@@ -4,17 +4,6 @@ require 'sportdb/config'
 require 'sportdb/models'   ## add sql database support
 
 
-##
-# fix!!!
-#   patches for worlddb/models  - move upstream!!!!
-module WorldDb
-  COUNTRY_KEY_PATTERN = '\A[a-z]{2,}\z'    # allow two AND three letter keys e.g. at, mx, eng, sco, etc.
-  COUNTRY_KEY_PATTERN_MESSAGE = "expected two or more lowercase letters a-z /#{COUNTRY_KEY_PATTERN}/"
-
-  COUNTRY_CODE_PATTERN = '\A[A-Z_]{2,}\z'
-  COUNTRY_CODE_PATTERN_MESSAGE = "expected two or more uppercase letters A-Z (and _) /#{COUNTRY_CODE_PATTERN}/"
-end  # module WorldDb
-
 
 ###
 # our own code

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-sync
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sportdb-config