chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Web services cleanup - Bug fixing

Browse Source
skala
Guillaume Viguier 15 years ago
parent 46fda5bc96
commit e9b7e48776
3 changed files with 55 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 35
      main/inc/lib/sessionmanager.lib.php
  2. 8
      main/webservices/webservice_session.php
  3. 37
      tests/test_webservices.php

35
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -467,21 +467,6 @@ class SessionManager {
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
// Get the list of courses related to this session
$course_list = SessionManager::get_course_list_by_session_id($session_id);
if(empty($course_list)) {
return false;
}
foreach($course_list as $course) {
$course_code = $course['code'];
// Delete user from course
Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$session_id' AND course_code='$course_code' AND id_user='$user_id'");
if(Database::affected_rows()) {
// Update number of users in this relation
Database::query("UPDATE $tbl_session_rel_course SET nbr_users=nbr_users - 1 WHERE id_session='$session_id' AND course_code='$course_code'");
}
}
$delete_sql = "DELETE FROM $tbl_session_rel_user WHERE id_session = '$session_id' AND id_user ='$user_id' AND relation_type<>".SESSION_RELATION_TYPE_RRHH."";
Database::query($delete_sql);
$return = Database::affected_rows();
@ -490,6 +475,20 @@ class SessionManager {
$update_sql = "UPDATE $tbl_session SET nbr_users= nbr_users - $return WHERE id='$session_id' ";
Database::query($update_sql);
// Get the list of courses related to this session
$course_list = SessionManager::get_course_list_by_session_id($session_id);
if(!empty($course_list)) {
foreach($course_list as $course) {
$course_code = $course['code'];
// Delete user from course
Database::query("DELETE FROM $tbl_session_rel_course_rel_user WHERE id_session='$session_id' AND course_code='$course_code' AND id_user='$user_id'");
if(Database::affected_rows()) {
// Update number of users in this relation
Database::query("UPDATE $tbl_session_rel_course SET nbr_users=nbr_users - 1 WHERE id_session='$session_id' AND course_code='$course_code'");
}
}
}
return true;
}
@ -1155,11 +1154,7 @@ class SessionManager {
$tbl_course = Database::get_main_table(TABLE_MAIN_COURSE);
$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
// select the courses
$sql = "SELECT id, code, title,visual_code, nbr_users, db_name
FROM $tbl_course,$tbl_session_rel_course
WHERE course_code = code
AND id_session='$session_id'
ORDER BY title";
$sql = "SELECT * FROM $tbl_course c INNER JOIN $tbl_session_rel_course src ON c.code = src.course_code WHERE src.id_session = '$session_id' ORDER BY title;";
$result = Database::query($sql);
$num_rows = Database::num_rows($result);
$courses = array();

8
main/webservices/webservice_session.php
Unescape View File

@ -3,6 +3,7 @@
require_once(dirname(__FILE__).'/../inc/global.inc.php');
$libpath = api_get_path(LIBRARY_PATH);
require_once($libpath.'sessionmanager.lib.php');
require_once($libpath.'course.lib.php');
require_once(dirname(__FILE__).'/webservice.php');
/**
@ -237,7 +238,7 @@ class WSSession extends WS {
return $user_id;
} else {
if($state == 1) {
SessionManager::subscribe_users_to_session($session_id, array($user_id));
SessionManager::suscribe_users_to_session($session_id, array($user_id));
} else {
$result = SessionManager::unsubscribe_user_from_session($session_id, $user_id);
if($result == false) {
@ -311,14 +312,15 @@ class WSSession extends WS {
return $course_id;
} else {
if($state == 1) {
SessionManager::add_courses_to_session($session_id, array($course_id));
$course_code = CourseManager::get_course_code_from_course_id($course_id);
SessionManager::add_courses_to_session($session_id, array($course_code));
return true;
} else {
$result = SessionManager::unsubscribe_course_from_session($session_id, $course_id);
if($result == true) {
return true;
} else {
return new WSError(304, 'Error subscribing course to session');
return new WSError(304, 'Error unsubscribing course from session');
}
}
return true;

37
tests/test_webservices.php
Unescape View File

@ -61,6 +61,25 @@ class TestSoapWebService extends UnitTestCase {
return $course;
}
protected function getSessionArray() {
$end_date = date('Y') + 1;
$end_date .= '-'.date('m-d');
$session = array(
'name' => 'My session',
'start_date' => date('Y-m-d'),
'end_date' => $end_date,
'nb_days_access_before' => 0,
'nb_days_access_after' => 0,
'nolimit' => 0,
'visibility' => 1,
'user_id_field_name' => 'chamilo_user_id',
'user_id_value' => '1',
'session_id_field_name' => 'chamilo_session_id',
'session_id_value' => '',
'extras' => array());
return $session;
}
protected function soapCall($method, $arguments) {
return $this->_client->__soapCall($method, $arguments);
}
@ -115,13 +134,13 @@ class TestSoapWebService extends UnitTestCase {
$this->soapCall('WSUser.DeleteUser', array('secret_key' => $this->_secret_key, 'user_id_field_name' => 'chamilo_user_id', 'user_id_value' => $result));
}
/*public function testCourseCreation() {
public function testCourseCreation() {
$course = $this->getCourseArray();
$result = $this->soapCall('WSCourse.CreateCourse', array_merge(array('secret_key' => $this->_secret_key), $course));
$this->assertIsA($result, 'int');
// Delete course created
$this->soapCall('WSCourse.DeleteCourse', array('secret_key' => $this->_secret_key, 'course_id_field_name' => 'chamilo_course_id', 'course_id_value' => $result));
}*/
}
/*public function testCourseSubscriptionAndUnsubscription() {
//$course_id = $this->createCourse();
@ -138,6 +157,20 @@ class TestSoapWebService extends UnitTestCase {
$result = $this->soapCall('WSCourse.ListCourses', array('secret_key' => $this->_secret_key, 'course_id_field_name' => 'chamilo_course_id'));
var_dump($result);
}*/
public function testSessionCreation() {
$session = $this->getSessionArray();
$result = $this->soapCall('WSSession.CreateSession', array_merge(array('secret_key' => $this->_secret_key), $session));
$this->assertIsA($result, 'int');
$this->soapCall('WSSession.DeleteSession', array('secret_key' => $this->_secret_key, 'session_id_field_name' => 'chamilo_session_id', 'session_id_value' => $result));
}
/*public function testUserSessionSubscriptionAndUnsubscription() {
$this->soapCall('WSSession.UnsubscribeCourseFromSession', array('secret_key' => $this->_secret_key, 'course_id_field_name' => 'chamilo_course_id', 'course_id_value' => 8, 'session_id_field_name' => 'chamilo_session_id', 'session_id_value' => 3));
//$this->soapCall('WSSession.UnsubscribeUserFromSession', array('secret_key' => $this->_secret_key, 'user_id_field_name' => 'chamilo_user_id', 'user_id_value' => 38, 'session_id_field_name' => 'chamilo_session_id', 'session_id_value' => 3));
}*/
}

Write Preview
Loading…
Cancel
Save