Merge branch 'master' of https://github.com/RestComm/Restcomm-Connect

Author: otsakir

restcomm/restcomm.application/src/main/webapp/WEB-INF/data/hsql/restcomm.script

@@ -24,6 +24,7 @@ CREATE MEMORY TABLE "restcomm_media_resource_broker_entity" ("conference_sid" VA
 CREATE MEMORY TABLE PUBLIC."restcomm_extensions_configuration"("sid" VARCHAR(34) NOT NULL PRIMARY KEY,"extension" VARCHAR(255) NOT NULL,"configuration_data" VARCHAR(16777216),"configuration_type" VARCHAR(255) NOT NULL,"date_created" TIMESTAMP NOT NULL,"date_updated" TIMESTAMP, "enabled" BOOLEAN DEFAULT TRUE NOT NULL)
 CREATE MEMORY TABLE PUBLIC."restcomm_accounts_extensions" ("account_sid" VARCHAR(34) NOT NULL, "extension_sid" VARCHAR(34) NOT NULL, PRIMARY KEY("account_sid", "extension_sid"), "configuration_data" VARCHAR(16777216))
 CREATE MEMORY TABLE "restcomm_geolocation"("sid" VARCHAR(34) NOT NULL PRIMARY KEY, "date_created" DATETIME NOT NULL, "date_updated" DATETIME NOT NULL, "date_executed" DATETIME NOT NULL, "account_sid" VARCHAR(34) NOT NULL, "source" VARCHAR(30), "device_identifier" VARCHAR(30) NOT NULL, "geolocation_type" VARCHAR(15) NOT NULL, "response_status" VARCHAR(30), "cell_id" VARCHAR(10), "location_area_code" VARCHAR(10), "mobile_country_code" INTEGER, "mobile_network_code" VARCHAR(3), "network_entity_address" BIGINT, "age_of_location_info" INTEGER, "device_latitude" VARCHAR(15), "device_longitude" VARCHAR(15), "accuracy" BIGINT, "physical_address" VARCHAR(50), "internet_address" VARCHAR(50), "formatted_address" VARCHAR(200), "location_timestamp" DATETIME, "event_geofence_latitude" VARCHAR(15), "event_geofence_longitude" VARCHAR(15), "radius" BIGINT, "geolocation_positioning_type" VARCHAR(15), "last_geolocation_response" VARCHAR(10), "cause" VARCHAR(150), "api_version" VARCHAR(10) NOT NULL, "uri" LONGVARCHAR NOT NULL)
+CREATE PROCEDURE PUBLIC."completeConferenceDetailRecord"(IN "in_sid" VARCHAR(100),IN "in_status" VARCHAR(100),IN "in_slave_ms_id" VARCHAR(100),IN "in_date_updated" TIMESTAMP,IN "amIMaster" BOOLEAN,OUT "completed" BOOLEAN) SPECIFIC "completeConferenceDetailRecord_10482" LANGUAGE SQL NOT DETERMINISTIC MODIFIES SQL DATA NEW SAVEPOINT LEVEL BEGIN ATOMIC SET "completed"=FALSE;IF("amIMaster")THEN UPDATE PUBLIC."restcomm_conference_detail_records" SET PUBLIC."restcomm_conference_detail_records"."master_present"=FALSE,PUBLIC."restcomm_conference_detail_records"."date_updated"="in_date_updated" WHERE PUBLIC."restcomm_conference_detail_records"."sid"="in_sid";IF NOT EXISTS(SELECT PUBLIC."restcomm_media_resource_broker_entity"."conference_sid",PUBLIC."restcomm_media_resource_broker_entity"."slave_ms_id",PUBLIC."restcomm_media_resource_broker_entity"."slave_ms_bridge_ep_id",PUBLIC."restcomm_media_resource_broker_entity"."slave_ms_cnf_ep_id",PUBLIC."restcomm_media_resource_broker_entity"."is_bridged_together" FROM PUBLIC."restcomm_media_resource_broker_entity" WHERE "conference_sid"="in_sid")THEN UPDATE PUBLIC."restcomm_conference_detail_records" SET "status"="in_status","date_updated"="in_date_updated" WHERE "sid"="in_sid";SET "completed"=TRUE;END IF;ELSE DELETE FROM PUBLIC."restcomm_media_resource_broker_entity" WHERE "conference_sid"="in_sid" AND "slave_ms_id"="in_slave_ms_id";IF NOT(SELECT "master_present" FROM PUBLIC."restcomm_conference_detail_records" WHERE "sid"="in_sid")THEN IF NOT EXISTS(SELECT PUBLIC."restcomm_media_resource_broker_entity"."conference_sid",PUBLIC."restcomm_media_resource_broker_entity"."slave_ms_id",PUBLIC."restcomm_media_resource_broker_entity"."slave_ms_bridge_ep_id",PUBLIC."restcomm_media_resource_broker_entity"."slave_ms_cnf_ep_id",PUBLIC."restcomm_media_resource_broker_entity"."is_bridged_together" FROM PUBLIC."restcomm_media_resource_broker_entity" WHERE "conference_sid"="in_sid")THEN UPDATE PUBLIC."restcomm_conference_detail_records" SET "status"="in_status","date_updated"="in_date_updated" WHERE "sid"="in_sid";SET "completed"=TRUE;END IF;END IF;END IF;END
 CREATE USER SA PASSWORD ""
 GRANT DBA TO SA
 SET WRITE_DELAY 10

restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/init.sql

@@ -477,3 +477,37 @@ BEGIN
 
 END //
 DELIMITER ;
+
+DELIMITER //
+DROP PROCEDURE IF EXISTS completeConferenceDetailRecord;
+CREATE PROCEDURE completeConferenceDetailRecord
+	(IN in_sid VARCHAR(100)
+	,IN in_status VARCHAR(100)
+	,IN in_slave_ms_id VARCHAR(100)
+	,IN in_date_updated TIMESTAMP
+	,IN amIMaster BOOLEAN
+	,OUT completed BOOLEAN)
+
+BEGIN
+
+START TRANSACTION;
+	SET completed=FALSE;
+	IF(amIMaster) THEN 
+		UPDATE restcomm_conference_detail_records SET restcomm_conference_detail_records.master_present=FALSE,restcomm_conference_detail_records.date_updated=in_date_updated WHERE restcomm_conference_detail_records.sid=in_sid;
+		IF NOT EXISTS (SELECT restcomm_media_resource_broker_entity.conference_sid,restcomm_media_resource_broker_entity.slave_ms_id,restcomm_media_resource_broker_entity.slave_ms_bridge_ep_id,restcomm_media_resource_broker_entity.slave_ms_cnf_ep_id,restcomm_media_resource_broker_entity.is_bridged_together FROM restcomm_media_resource_broker_entity WHERE conference_sid=in_sid ) THEN 
+			UPDATE restcomm_conference_detail_records SET status=in_status,date_updated=in_date_updated WHERE sid=in_sid;
+			SET completed=TRUE;
+		END IF;
+	ELSE 
+		DELETE FROM restcomm_media_resource_broker_entity WHERE conference_sid=in_sid AND slave_ms_id=in_slave_ms_id;
+		IF NOT(SELECT master_present FROM restcomm_conference_detail_records WHERE sid=in_sid) THEN 
+			IF NOT EXISTS(SELECT restcomm_media_resource_broker_entity.conference_sid,restcomm_media_resource_broker_entity.slave_ms_id,restcomm_media_resource_broker_entity.slave_ms_bridge_ep_id,restcomm_media_resource_broker_entity.slave_ms_cnf_ep_id,restcomm_media_resource_broker_entity.is_bridged_together FROM restcomm_media_resource_broker_entity WHERE conference_sid=in_sid ) THEN 
+				UPDATE restcomm_conference_detail_records SET status=in_status,date_updated=in_date_updated WHERE sid=in_sid;
+				SET completed=TRUE;
+			END IF;
+		END IF;
+	END IF;
+COMMIT;
+
+END //
+DELIMITER ;

restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/sql/conference-detail-records.xml

@@ -7,6 +7,9 @@
     <insert id="addConferenceDetailRecord" parameterType="map">
         call addConferenceDetailRecord( #{sid}, #{date_created}, #{date_updated}, #{account_sid}, #{status}, #{friendly_name}, #{api_version}, #{uri}, #{master_ms_id}, #{master_present} );
     </insert>
+    <select id="completeConferenceDetailRecord" parameterType="map"  statementType="CALLABLE">
+            call completeConferenceDetailRecord( #{sid, mode=IN, jdbcType=VARCHAR}, #{status, mode=IN, jdbcType=VARCHAR}, #{slaveMsId, mode=IN, jdbcType=VARCHAR}, #{dateUpdated, mode=IN, jdbcType=TIMESTAMP}, #{amIMaster, mode=IN, jdbcType=BOOLEAN}, #{completed, mode=OUT, jdbcType=BOOLEAN} );
+    </select>
 	<select id="getConferenceDetailRecord" parameterType="string" resultType="hashmap">
 		SELECT * FROM restcomm_conference_detail_records WHERE sid=#{sid};
 	</select>

restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/conference-detail-records.xml

@@ -7,6 +7,9 @@
     <insert id="addConferenceDetailRecord" parameterType="map">
 		INSERT INTO "restcomm_conference_detail_records" ("sid", "date_created", "date_updated", "account_sid", "status", "friendly_name", "api_version", "uri", "master_ms_id", "master_present") VALUES (#{sid}, #{date_created}, #{date_updated}, #{account_sid}, #{status}, #{friendly_name}, #{api_version}, #{uri}, #{master_ms_id}, #{master_present});
     </insert>
+    <select id="completeConferenceDetailRecord" parameterType="map"  statementType="CALLABLE">
+            call "completeConferenceDetailRecord"( #{sid, mode=IN, jdbcType=VARCHAR}, #{status, mode=IN, jdbcType=VARCHAR}, #{slaveMsId, mode=IN, jdbcType=VARCHAR}, #{dateUpdated, mode=IN, jdbcType=TIMESTAMP}, #{amIMaster, mode=IN, jdbcType=BOOLEAN}, #{completed, mode=OUT, jdbcType=BOOLEAN} );
+    </select>
 	<select id="getConferenceDetailRecord" parameterType="string" resultType="hashmap">
 		SELECT * FROM "restcomm_conference_detail_records" WHERE "sid"=#{sid};
 	</select>

restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/ConferenceDetailRecordsDao.java

@@ -20,11 +20,12 @@
 package org.restcomm.connect.dao;
 
 import java.util.List;
+import java.util.Map;
 
 import org.joda.time.DateTime;
+import org.restcomm.connect.commons.dao.Sid;
 import org.restcomm.connect.dao.entities.ConferenceDetailRecord;
 import org.restcomm.connect.dao.entities.ConferenceDetailRecordFilter;
-import org.restcomm.connect.commons.dao.Sid;
 import org.restcomm.connect.dao.entities.ConferenceRecordCountFilter;
 
 /**
@@ -62,4 +63,16 @@ public interface ConferenceDetailRecordsDao {
     void updateConferenceDetailRecordMasterBridgeEndpointID(ConferenceDetailRecord cdr);
 
     void updateModeratorPresent(ConferenceDetailRecord cdr);
+
+    /**
+     * @param params
+     * {sid, mode=IN, jdbcType=VARCHAR}
+     * {status, mode=IN, jdbcType=VARCHAR}
+     * {slaveMsId, mode=IN, jdbcType=VARCHAR}
+     * {dateUpdated, mode=IN, jdbcType=TIMESTAMP}
+     * {amIMaster, mode=IN, jdbcType=BOOLEAN}
+     * {completed, mode=OUT, jdbcType=BOOLEAN}
+     * @return true/false depending on if calling agent was able to complete the conference or not.
+     */
+    boolean completeConferenceDetailRecord(Map params);
 }

restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisConferenceDetailRecordsDao.java

@@ -198,6 +198,17 @@ public void updateModeratorPresent(ConferenceDetailRecord cdr) {
         }
     }
 
+    @Override
+    public boolean completeConferenceDetailRecord(Map params) {
+        final SqlSession session = sessions.openSession();
+        try {
+            session.selectOne(namespace + "completeConferenceDetailRecord", params);
+            return (boolean)params.get("completed");
+        } finally {
+            session.close();
+        }
+    }
+
     @Override
     public void removeConferenceDetailRecord(Sid sid) {
         // TODO Add support for conference modification after basic API's as twillio's

restcomm/restcomm.docs/sources-asciidoc/src/main/asciidoc/api/account-api.adoc

@@ -146,6 +146,7 @@ The above commands will print an output similar to the one below:
 |Status |The status of this account. Default is active, possible values are active, suspended, and closed.
 |Password(Required) |A password that will be used to generate the AuthToken for the new Account resource.
 |Role(Required) |The security role that this Account resource will use. If no role is provided then the role of the account resource creating this will be inherited to the new Account resource and may compromise the system.
+|OrganizationSid |Sid of organization, in case you want to create this account under a different account than its parent account. By default each new account will inherit its parent's organization. Please note only Super Admins have right to create an account under a different organization.
 |==============================================================================================================================================================================================================================
 
 
@@ -165,12 +166,18 @@ curl -X GET https://[primarySid]:[primaryAuthToken]@127.0.0.1:8080/restcomm/2012
 curl -X GET https://[primarySid]:[primaryAuthToken]@127.0.0.1:8080/restcomm/2012-04-24/Accounts/
 ----
 
-Here is an example of how to createa a **sub-account**. The sub-account will inherit the same permissions has the Administrator's account.
+Here is an example of how to create a **sub-account**. The sub-account will inherit the same permissions has the Administrator's account.
 
 ....
 curl -X POST https://administrator%40company.com:77f8c12cc7b8f8423e5c38b035249166@127.0.0.1:8080/restcomm/2012-04-24/Accounts/ -d "FriendlyName=MySubAccount" -d "EmailAddress=test@telestax.com" -d "Password=restcomm"
 ....
 
+Here is an example of creating an account under a specific organization.
+
+....
+curl -X POST https://<Sid>:<authToken>@<restcommAdress>/restcomm/2012-04-24/Accounts/ -d "FriendlyName=MySubAccount" -d "EmailAddress=test@telestax.com" -d "Password=restcomm" -d "OrganizationSid=<OrganizationSid>"
+....
+
 
 === Supported Operations