osm 1.2.14 → 1.2.15.dev

data/spec/osm/badges_spec.rb

@@ -8,59 +8,98 @@ describe "Badges" do
 
     it "Get due badges" do
       data = {
+        'includeStock' => true,
+        'count' => 2,
+        'badgesToBuy' => 0,
+        'description' => {
+          '93_0' => {
+            'badge_identifier' => '93_0',
+            'msg' => 'You do not have enough badges!',
+            'name' => 'Participation',
+            'picture' => '',
+            'typeLabel' => 'Staged',
+            'type_id' => 3
+          },
+          '145_0' => {
+            'badge_identifier' => '145_0',
+            'name' => 'Badge Name',
+            'picture' => '',
+            'typeLabel' => 'Activity',
+            'type_id' => 2
+          },
+        },
         'pending' => {
-          'badge_name' => [
+          '93_0' => [
             {
-              'scoutid' => '1',
+              'badge_id' => '93',
+              'badge_identifier' => '93_0',
+              'badge_version' => '0',
+              'completed' => '2',
+              'current_stock' => '20',
+              'extra' => 'Lvl 2',
               'firstname' => 'John',
+              'label' => 'Staged',
               'lastname' => 'Doe',
-              'level' => '',
-              'extra' => '',
-            }
-          ],
-          'staged_staged_participation' => [{
-              'scoutid' => '2',
+              'name' => 'Participation',
+              'patrolid' => '1502',
+              'pic' => true,
+              'picture' => '',
+              'scout_id' => '1',
+              'sid' => '1',
+              'type_id' => '3',
+            },
+            {
+              'badge_id' => '93',
+              'badge_identifier' => '93_0',
+              'badge_version' => '0',
+              'completed' => '2',
+              'current_stock' => '20',
+              'extra' => 'Lvl 2',
               'firstname' => 'Jane',
+              'label' => 'Staged',
               'lastname' => 'Doe',
-              'level' => '2',
-              'extra' => 'Lvl 2'
-            }, {
-              'scoutid' => '1',
-              'firstname' => 'John',
-              'lastname' => 'Doe',
-              'level' => '2',
-              'extra' => 'Lvl 2'
-            }
-          ]
-        },
-        'description' => {
-          'badge_name' => {
+              'name' => 'Participation',
+              'patrolid' => '1502',
+              'pic' => true,
+              'picture' => '',
+              'scout_id' => '2',
+              'sid' => '2',
+              'type_id' => '3',
+            },
+          ],
+          '145_0' => [{
+            'badge_id' => '145',
+            'badge_identifier' => '145_0',
+            'badge_version' => '0',
+            'completed' => '1',
+            'current_stock' => '10',
+            'firstname' => 'John',
+            'label' => 'Activity',
+            'lastname' => 'Doe',
             'name' => 'Badge Name',
-            'section' => 'cubs',
-            'type' => 'activity',
-            'badge' => 'badge_name'
-          },
-          'staged_staged_participation' => {
-            'name' => 'Participation',
-            'section' => 'staged',
-            'type' => 'staged',
-            'badge' => 'participation'
-          }
-        }
+            'patrolid' => '1502',
+            'pic' => true,
+            'picture' => '',
+            'scout_id' => '1',
+            'sid' => '1',
+            'type_id' => '2',
+          }],
+        },
       }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=outstandingBadges&section=cubs&sectionid=1&termid=2", :body => data.to_json, :content_type => 'application/json')
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/badges/due/?action=get&section=cubs&sectionid=1&termid=2", :body => data.to_json, :content_type => 'application/json')
 
       db = Osm::Badges.get_due_badges(@api, Osm::Section.new(:id => 1, :type => :cubs), 2)
       db.empty?.should be_false
-      db.badge_names.should == {'badge_name_1'=>'Badge Name', 'staged_staged_participation_2'=>'Participation (Level 2)'}
-      db.by_member.should == {1=>['badge_name_1', 'staged_staged_participation_2'], 2=>['staged_staged_participation_2']}
+      db.badge_names.should == {'145_0_1'=>'Activity - Badge Name', '93_0_2'=>'Staged - Participation (Lvl 2)'}
+      db.by_member.should == {1=>['93_0_2', '145_0_1'], 2=>['93_0_2']}
       db.member_names.should == {1 => 'John Doe', 2 => 'Jane Doe'}
-      db.totals.should == {'staged_staged_participation_2'=>2, 'badge_name_1'=>1}
+      db.badge_stock.should == {'93_0_2'=>20, '145_0_1'=>10}
+      db.totals.should == {'93_0_2'=>2, '145_0_1'=>1}
       db.valid?.should be_true
     end
 
     it "handles an empty array representing no due badges" do
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=outstandingBadges&section=cubs&sectionid=1&termid=2", :body => '[]', :content_type => 'application/json')
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/badges/due/?action=get&section=cubs&sectionid=1&termid=2", :body => '[]', :content_type => 'application/json')
       db = Osm::Badges.get_due_badges(@api, Osm::Section.new(:id => 1, :type => :cubs), 2)
       db.should_not be_nil
     end
@@ -68,13 +107,13 @@ describe "Badges" do
 
     it "Fetch badge stock levels" do
       badges_body = {
-        'stock' => {
-          'sectionid' => '1',
-          'badge_1' => '1',
-          'badge_2' => '2'
-        }
+        'identifier' => 'badge_id_level',
+        'items' => [
+          { 'shortname' => 'badge_1', 'stock' => 1, 'desired' => 0, 'due' => 0 },
+          { 'shortname' => 'badge_2', 'stock' => 2, 'desired' => 0, 'due' => 0 },
+        ]
       }
-      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/challenges.php?action=getInitialBadges&type=core&sectionid=1&section=beavers&termid=2", :body => badges_body.to_json, :content_type => 'application/json')
+      FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/ext/badges/stock/?action=getBadgeStock&section=beavers&section_id=1&term_id=2", :body => badges_body.to_json, :content_type => 'application/json')
       Osm::Term.stub(:get_current_term_for_section) { Osm::Term.new(:id => 2) }
 
       section = Osm::Section.new(:id => 1, :type => :beavers)
@@ -84,26 +123,28 @@ describe "Badges" do
     describe "Update badge stock levels" do
 
       it "Succeds" do
-        url = "https://www.onlinescoutmanager.co.uk/challenges.php?action=updateStock"
+        url = "https://www.onlinescoutmanager.co.uk/ext/badges.php?action=updateStock"
         HTTParty.should_receive(:post).with(url, {:body => {
           'apiid' => @CONFIGURATION[:api][:osm][:id],
           'token' => @CONFIGURATION[:api][:osm][:token],
           'userid' => 'user_id',
           'secret' => 'secret',
           'stock' => 10,
-          'table' => 'badge',
-          'sectionid' => 1,
+          'sectionid' => 2,
           'section' => :beavers,
-        }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"sectionid":"1","badge":"10"}'}) }
+          'type' => 'current',
+          'level' => 1,
+          'badge_id' => 3
+        }}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true}'}) }
 
-        section = Osm::Section.new(:id => 1, :type => :beavers)
-        Osm::Badges.update_stock(@api, section, 'badge', 10).should be_true
+        section = Osm::Section.new(:id => 2, :type => :beavers)
+        Osm::Badges.update_stock(@api, section, 3, 10).should be_true
       end
 
       it "Fails" do
-        HTTParty.stub(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"sectionid":"1","badge":"1"}'}) }
+        HTTParty.stub(:post) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":false}'}) }
         section = Osm::Section.new(:id => 1, :type => :beavers)
-        Osm::Badges.update_stock(@api, section, 'badge', 10).should be_false
+        Osm::Badges.update_stock(@api, section, 3, 10).should be_false
       end
 
     end

data/spec/osm/event_spec.rb

@@ -123,20 +123,22 @@ describe "Event" do
   
     it "Create" do
       bl = Osm::Event::BadgeLink.new(
-        :badge_key => 'artist',
         :badge_type => :activity,
-        :requirement_key => 'a_01',
         :badge_section => :cubs,
         :requirement_label => 'A: Poster',
-        :badge_label => 'Artist',
-        :data => 'abc'
+        :data => 'abc',
+        :badge_name => 'Artist',
+        :badge_id => 1,
+        :badge_version => 0,
+        :requirement_id => 2,
       )
   
-      bl.badge_key.should == 'artist'
       bl.badge_type.should == :activity
-      bl.requirement_key.should == 'a_01'
       bl.badge_section.should == :cubs
-      bl.badge_label.should == 'Artist'
+      bl.badge_name.should == 'Artist'
+      bl.badge_id.should == 1
+      bl.badge_version.should == 0
+      bl.requirement_id.should == 2
       bl.requirement_label.should == 'A: Poster'
       bl.data.should == 'abc'
       bl.valid?.should be_true
@@ -187,8 +189,8 @@ describe "Event" do
         'publicnotes' => 'public notepad',
         'config' => '[{"id":"f_1","name":"Name","pL":"Label","pR":"1"}]',
         'badgelinks' => [
-          {"section"=>"cubs", "badgetype"=>"activity", "badge"=>"athletics", "columnname"=>"b_06", "data"=>"", "badgeLongName"=>"Athletics", "columnnameLongName"=>"B: Run", "sectionLongName"=>"Cubs", "badgetypeLongName"=>"Activity"},
-          {"section"=>"staged", "badgetype"=>"staged", "badge"=>"hikes", "columnname"=>"custom_69153", "data"=>"1", "badgeLongName"=>"Hikes", "columnnameLongName"=>"C: Hike name = 1", "sectionLongName"=>"Staged", "badgetypeLongName"=>"Staged"},
+          {"section"=>"cubs", "badgetype"=>"activity", "badge"=>"activity_athletics", "columnname"=>"b", "data"=>"Yes", "badgeLongName"=>"Athletics", "columnnameLongName"=>"B: Run", "sectionLongName"=>"Cubs", "badgetypeLongName"=>"Activity", "badge_id"=>"179", "badge_version"=>"0", "column_id"=>"3"},
+          {"section"=>"staged", "badgetype"=>"staged", "badge"=>"hikes", "columnname"=>"custom", "data"=>"1", "badgeLongName"=>"Hikes", "columnnameLongName"=>"C: Hike name = 1", "sectionLongName"=>"Staged", "badgetypeLongName"=>"Staged", "badge_id"=>"197", "badge_version"=>"0", "column_id"=>"4"},
         ],
         'sectionid' => '1',
         'googlecalendar' => nil,
@@ -237,17 +239,18 @@ describe "Event" do
         event.columns[0].name.should == 'Name'
         event.columns[0].label.should == 'Label'
         event.columns[0].parent_required.should be_true
-        event.badges[0].badge_key.should == 'athletics'
-        event.badges[0].badge_label.should == 'Athletics'
+        event.badges[0].badge_name.should == 'Athletics'
         event.badges[0].badge_section.should == :cubs
         event.badges[0].badge_type.should == :activity
-        event.badges[0].requirement_key.should == 'b_06'
-        event.badges[0].data.should == ''
+        event.badges[0].requirement_id.should == 3
+        event.badges[0].data.should == 'Yes'
         event.badges[0].requirement_label.should == 'B: Run'
-        event.badges[1].badge_key.should == 'hikes'
+        event.badges[0].badge_id.should == 179
+        event.badges[0].badge_version.should == 0
+        event.badges[1].badge_name.should == 'Hikes'
         event.badges[1].badge_section.should == :staged
         event.badges[1].badge_type.should == :staged
-        event.badges[1].requirement_key.should == 'custom_69153'
+        event.badges[1].requirement_id.should == 4
         event.badges[1].data.should == '1'
         event.valid?.should be_true
       end
@@ -604,7 +607,7 @@ describe "Event" do
             :attendance_reminder => 1,
             :allow_booking => true,
           }
-          @badge_url = 'https://www.onlinescoutmanager.co.uk/ext/events/event/index.php?action=badgeAddToEvent&sectionid=1&eventid=2'
+          @badge_url = 'https://www.onlinescoutmanager.co.uk/ext/badges/records/index.php?action=linkBadgeToItem&sectionid=1'
         end
 
         it "'Normal badge'" do
@@ -613,22 +616,27 @@ describe "Event" do
             'token' => @CONFIGURATION[:api][:osm][:token],
             'userid' => 'user_id',
             'secret' => 'secret',
+            'type' => 'event',
+            'id' => 2,
             'section' => :beavers,
-            'badgetype' => :activity,
-            'badge' => 'test',
-            'columnname' => 'a_01',
-            'data' => '',
-            'newcolumnname' => '',
+            'sectionid' => 1,
+            'badge_id' => 3,
+            'badge_version' => 2,
+            'column_id' => 1,
+            'column_data' => '',
+            'new_column_name' => '',
           }
-          HTTParty.should_receive(:post).with(@badge_url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true}'}) }
+          HTTParty.should_receive(:post).with(@badge_url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"status":true}'}) }
 
           @attributes[:badges] = [Osm::Event::BadgeLink.new(
-            badge_key: 'test',
             badge_type: :activity,
-            requirement_key: 'a_01',
             badge_section: :beavers,
             requirement_label: '',
             data: '',
+            badge_name: 'Test badge',
+            badge_id: 3,
+            badge_version: 2,
+            requirement_id: 1,
           )]
           event = Osm::Event.create(@api, @attributes)
           event.should_not be_nil
@@ -641,22 +649,26 @@ describe "Event" do
             'token' => @CONFIGURATION[:api][:osm][:token],
             'userid' => 'user_id',
             'secret' => 'secret',
-            'section' => :staged,
-            'badgetype' => :staged,
-            'badge' => 'hikes',
-            'columnname' => '',
-            'data' => '1',
-            'newcolumnname' => 'Label for added column',
+            'type' => 'event',
+            'id' => 2,
+            'section' => :beavers,
+            'sectionid' => 1,
+            'badge_id' => 3,
+            'badge_version' => 2,
+            'column_id' => -2,
+            'column_data' => '1',
+            'new_column_name' => 'Label for added column',
           }
-          HTTParty.should_receive(:post).with(@badge_url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true}'}) }
+          HTTParty.should_receive(:post).with(@badge_url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"status":true}'}) }
 
           @attributes[:badges] = [Osm::Event::BadgeLink.new(
-            badge_key: 'hikes',
             badge_type: :staged,
-            requirement_key: '',
-            badge_section: :staged,
+            badge_section: :beavers,
             requirement_label: 'Label for added column',
             data: '1',
+            badge_name: 'Test badge',
+            badge_id: 3,
+            badge_version: 2,
           )]
           event = Osm::Event.create(@api, @attributes)
           event.should_not be_nil
@@ -669,22 +681,27 @@ describe "Event" do
             'token' => @CONFIGURATION[:api][:osm][:token],
             'userid' => 'user_id',
             'secret' => 'secret',
-            'section' => :staged,
-            'badgetype' => :staged,
-            'badge' => 'nights',
-            'columnname' => 'custom_01234',
-            'data' => '2',
-            'newcolumnname' => '',
+            'type' => 'event',
+            'id' => 2,
+            'section' => :beavers,
+            'sectionid' => 1,
+            'badge_id' => 3,
+            'badge_version' => 2,
+            'column_id' => 4,
+            'column_data' => '2',
+            'new_column_name' => '',
           }
-          HTTParty.should_receive(:post).with(@badge_url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true}'}) }
+          HTTParty.should_receive(:post).with(@badge_url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"status":true}'}) }
 
           @attributes[:badges] = [Osm::Event::BadgeLink.new(
-            badge_key: 'nights',
             badge_type: :staged,
-            requirement_key: 'custom_01234',
-            badge_section: :staged,
+            badge_section: :beavers,
             requirement_label: '',
             data: '2',
+            badge_name: 'Test badge',
+            badge_id: 3,
+            badge_version: 2,
+            requirement_id: 4,
           )]
           event = Osm::Event.create(@api, @attributes)
           event.should_not be_nil
@@ -836,7 +853,16 @@ describe "Event" do
             :cost => '1.23',
             :location => 'Somewhere',
             :notes => 'none',
-            :badges => [Osm::Event::BadgeLink.new(badge_key: 'test')],
+            :badges => [Osm::Event::BadgeLink.new(
+              badge_type: :activity,
+              badge_section: :scouts,
+              requirement_label: 'A: Paint',
+              data: 'Yes',
+              badge_name: 'Artist',
+              badge_id: 3,
+              badge_version: 2,
+              requirement_id: 4,
+            )],
             :columns => [],
             :notepad => '',
             :public_notepad => '',
@@ -851,44 +877,38 @@ describe "Event" do
         end
 
         it "Added" do
-          url = 'https://www.onlinescoutmanager.co.uk/ext/events/event/index.php?action=badgeAddToEvent&sectionid=1&eventid=2'
-          post_data = {
-            'apiid' => @CONFIGURATION[:api][:osm][:id],
-            'token' => @CONFIGURATION[:api][:osm][:token],
-            'userid' => 'user_id',
-            'secret' => 'secret',
-            'badgelinks' => [{
-              'section' => nil,
-              'badgetype' => nil,
-              'badge' => 'test2',
-              'columnname' => nil,
-              'data' => nil,
-              'newcolumnname' => nil,
-            }],
-          }
-          HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true,"error":"Update Error"}'}) }
-
-          @event.badges.push(Osm::Event::BadgeLink.new(badge_key: 'test2'))
+          badge = Osm::Event::BadgeLink.new(
+            badge_type: :activity,
+            badge_section: :scouts,
+            requirement_label: 'A: Draw',
+            data: 'Yes',
+            badge_name: 'Artist',
+            badge_id: 3,
+            badge_version: 2,
+            requirement_id: 6,
+          )
+          @event.should_receive(:add_badge_link).with(@api, badge) { true }
+
+          @event.badges.push(badge)
           @event.update(@api).should be_true
         end
 
         it "Removed" do
-          url = 'https://www.onlinescoutmanager.co.uk/ext/events/event/index.php?action=badgeDeleteFromEvent&sectionid=1&eventid=2'
+          url = 'https://www.onlinescoutmanager.co.uk/ext/badges/records/index.php?action=deleteBadgeLink&sectionid=1'
           post_data = {
             'apiid' => @CONFIGURATION[:api][:osm][:id],
             'token' => @CONFIGURATION[:api][:osm][:token],
             'userid' => 'user_id',
             'secret' => 'secret',
-            'badgelinks' => [{
-              'section' => nil,
-              'badgetype' => nil,
-              'badge' => 'test',
-              'columnname' => nil,
-              'data' => nil,
-              'newcolumnname' => nil,
-            }],
+            'section' => :scouts,
+            'sectionid' => 1,
+            'type' => 'event',
+            'id' => 2,
+            'badge_id' => 3,
+            'badge_version' => 2,
+            'column_id' => 4,
           }
-          HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"ok":true,"error":"Update Error"}'}) }
+          HTTParty.should_receive(:post).with(url, {:body => post_data}) { OsmTest::DummyHttpResult.new(:response=>{:code=>'200', :body=>'{"status":true}'}) }
 
           @event.badges = []
           @event.update(@api).should be_true
@@ -1215,13 +1235,13 @@ describe "Event" do
 
   describe "API Strangeness" do
 
-    it "handles a non existant array when no events" do
+    it "Handles a non existant array when no events" do
       data = '{"identifier":"eventid","label":"name"}'
       FakeWeb.register_uri(:post, "https://www.onlinescoutmanager.co.uk/events.php?action=getEvents&sectionid=1&showArchived=true", :body => data, :content_type => 'application/json')
       events = Osm::Event.get_for_section(@api, 1).should == []
     end
 
-    it "handles missing config from OSM" do
+    it "Handles missing config from OSM" do
       events_body = '{"identifier":"eventid","label":"name","items":[{"eventid":"2","name":"An Event","startdate":"2001-02-03","enddate":"2001-02-05","starttime":"00:00:00","endtime":"12:00:00","cost":"0.00","location":"Somewhere","notes":"Notes","sectionid":1,"googlecalendar":null,"archived":"0","confdate":null,"allowchanges":"1","disablereminders":"1","attendancelimit":"3","limitincludesleaders":"1"}]}'
 
       event_body = {