Merge pull request #125 from openbase/119-implement-low-battery-notif…

…ication-system

119 implement low battery notification system

build-docker.sh

@@ -10,10 +10,13 @@ WHITE='\033[0;37m'
 
 APP_NAME='docker images'
 APP_NAME=${BLUE}${APP_NAME}${NC}
-echo -e "=== ${APP_NAME} build docker image...${WHITE}${NC}" &&
-docker build -f docker/Dockerfile -t openbaseorg/bco:local .
-docker build -f docker/device-manager/openhab/Dockerfile -t openbaseorg/bco-device-manager-openhab:local --build-arg BCO_BASE_IMAGE_VERSION=local docker/device-manager/openhab
-docker build -f docker/bco-demo/Dockerfile -t openbaseorg/bco-demo:local --build-arg BCO_BASE_IMAGE_VERSION=local docker/bco-demo
+IMAGE_TAG=${1:-local}
+
+echo -e "=== ${APP_NAME} build docker image...${WHITE}${NC}"
+
+docker build -f docker/Dockerfile -t openbaseorg/bco:${IMAGE_TAG} .
+docker build -f docker/device-manager/openhab/Dockerfile -t openbaseorg/bco-device-manager-openhab:${IMAGE_TAG} --build-arg BCO_BASE_IMAGE_VERSION=${IMAGE_TAG} docker/device-manager/openhab
+docker build -f docker/bco-demo/Dockerfile -t openbaseorg/bco-demo:${IMAGE_TAG} --build-arg BCO_BASE_IMAGE_VERSION=${IMAGE_TAG} docker/bco-demo
 
 # use this for debugging purpose: DOCKER_BUILDKIT=0 docker build -f docker/Dockerfile --progress=plain .
 echo -e "=== ${APP_NAME} were ${GREEN}successfully${NC} build.${NC}"

module/api/graphql/src/main/java/org/openbase/bco/api/graphql/BcoGraphQlApiSpringBootApplication.kt

@@ -57,7 +57,8 @@ import org.springframework.context.annotation.Bean
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
- */@SpringBootApplication
+ */
+@SpringBootApplication
 open class BcoGraphQlApiSpringBootApplication {
     private var injector: Injector? = null
 
@@ -84,6 +85,8 @@ open class BcoGraphQlApiSpringBootApplication {
         )
         val unitDataOutputType = schema.getType("openbase_type_domotic_unit_UnitData") as GraphQLOutputType?
         val unitConfigOutputType = schema.getType("openbase_type_domotic_unit_UnitConfig") as GraphQLOutputType?
+        val userMessageOutputType =
+            schema.getType("openbase_type_domotic_communication_UserMessage") as GraphQLOutputType?
         val unitFilterInputType = schema.getType("Input_openbase_type_domotic_unit_UnitFilter") as GraphQLInputType?
         val unitFilterInputConverter =
             GqlInputConverter.newBuilder().add(UnitFilterType.UnitFilter.getDescriptor().file).build()
@@ -99,6 +102,11 @@ open class BcoGraphQlApiSpringBootApplication {
                 .argument(GraphQLArgument.newArgument().name("includeDisabledUnits").type(Scalars.GraphQLBoolean))
                 .build()
         )
+        builder.field(
+            GraphQLFieldDefinition.newFieldDefinition().name("userMessages")
+                .type(GraphQLList.list(userMessageOutputType))
+                .build()
+        )
         val codeRegistry = GraphQLCodeRegistry.newCodeRegistry(schema.codeRegistry)
             .dataFetcher(FieldCoordinates.coordinates("Subscription", "units"), DataFetcher { dataFetchingEnvironment ->
                 val unitFilter = unitFilterInputConverter.createProtoBuf(
@@ -122,6 +130,11 @@ open class BcoGraphQlApiSpringBootApplication {
                     }
                     SubscriptionModule.subscribeUnitConfigs(unitFilter, includeDisabledUnits)
                 })
+            .dataFetcher(
+                FieldCoordinates.coordinates("Subscription", "userMessages"),
+                DataFetcher {
+                    SubscriptionModule.subscribeUserMessages()
+                })
             .build()
         return GraphQLSchema.newSchema(schema)
             .subscription(builder.build())

module/api/graphql/src/main/java/org/openbase/bco/api/graphql/context/AbstractBCOGraphQLContext.kt

@@ -34,7 +34,7 @@ abstract class AbstractBCOGraphQLContext(
     abstract val languageCode: String?
 
     val auth: AuthTokenType.AuthToken?
-        get() = AuthTokenType.AuthToken.newBuilder().setAuthenticationToken(token).build()
+        get() = token?.let { AuthTokenType.AuthToken.newBuilder().setAuthenticationToken(it).build() }
 
     companion object {
         const val DATA_LOADER_UNITS = "units"

module/api/graphql/src/main/java/org/openbase/bco/api/graphql/schema/RegistrySchemaModule.kt

@@ -10,6 +10,9 @@ import org.openbase.bco.api.graphql.error.GenericError
 import org.openbase.bco.api.graphql.error.ServerError
 import org.openbase.bco.authentication.lib.SessionManager
 import org.openbase.bco.authentication.lib.iface.BCOSession
+import org.openbase.bco.registry.message.remote.registerUserMessageAuthenticated
+import org.openbase.bco.registry.message.remote.removeUserMessageAuthenticated
+import org.openbase.bco.registry.message.remote.updateUserMessageAuthenticated
 import org.openbase.bco.registry.remote.Registries
 import org.openbase.bco.registry.remote.session.BCOSessionImpl
 import org.openbase.bco.registry.unit.remote.registerUnitConfigAuthenticated
@@ -21,6 +24,7 @@ import org.openbase.jul.extension.type.processing.LabelProcessor.getBestMatch
 import org.openbase.jul.extension.type.processing.LabelProcessor.replace
 import org.openbase.type.configuration.EntryType
 import org.openbase.type.configuration.MetaConfigType
+import org.openbase.type.domotic.communication.UserMessageType.UserMessage
 import org.openbase.type.domotic.service.ServiceTemplateType
 import org.openbase.type.domotic.unit.UnitConfigType
 import org.openbase.type.domotic.unit.UnitConfigType.UnitConfig
@@ -56,7 +60,8 @@ import java.util.concurrent.*
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
- */   class RegistrySchemaModule : SchemaModule() {
+ */
+class RegistrySchemaModule : SchemaModule() {
     /**
      * Check if an authentication token retrieved by the login method is still valid.
      *
@@ -157,6 +162,10 @@ import java.util.concurrent.*
         @Arg("includeDisabledUnits") includeDisabledUnits: Boolean?,
     ): ImmutableList<UnitConfigType.UnitConfig> = getUnitConfigs(unitFilter, includeDisabledUnits)
 
+    @Query("userMessages")
+    @Throws(BCOGraphQLError::class)
+    fun userMessages(): ImmutableList<UserMessage> = getUserMessages()
+
     @Query("gatewayClasses")
     @Throws(CouldNotPerformException::class, InterruptedException::class)
     fun gatewayClasses(): ImmutableList<GatewayClassType.GatewayClass> =
@@ -401,7 +410,7 @@ import java.util.concurrent.*
                 break
             }
         }
-        if (!entry.value.isEmpty()) {
+        if (entry.value.isNotEmpty()) {
             metaConfigBuilder.addEntry(entry)
         }
 
@@ -419,6 +428,92 @@ import java.util.concurrent.*
         throw GenericError(ex)
     }
 
+    @Mutation("updateUserMessage")
+    @Throws(BCOGraphQLError::class)
+    fun updateUserMessage(
+        @Arg("userMessage") userMessage: UserMessage,
+        env: DataFetchingEnvironment,
+    ): UserMessage = try {
+        val userMessageBuilder = Registries.getMessageRegistry(
+            ServerError.BCO_TIMEOUT_SHORT,
+            ServerError.BCO_TIMEOUT_TIME_UNIT
+        )
+            .getUserMessageById(userMessage.id)
+            .toBuilder()
+        userMessageBuilder.mergeFromWithoutRepeatedFields(userMessage)
+        Registries.getMessageRegistry(
+            ServerError.BCO_TIMEOUT_SHORT,
+            ServerError.BCO_TIMEOUT_TIME_UNIT
+        ).updateUserMessageAuthenticated(
+            userMessageBuilder.build(),
+            env.context.auth
+        )[ServerError.BCO_TIMEOUT_SHORT, ServerError.BCO_TIMEOUT_TIME_UNIT]
+    } catch (ex: RuntimeException) {
+        throw GenericError(ex)
+    } catch (ex: CouldNotPerformException) {
+        throw GenericError(ex)
+    } catch (ex: InterruptedException) {
+        throw GenericError(ex)
+    } catch (ex: ExecutionException) {
+        throw GenericError(ex)
+    } catch (ex: TimeoutException) {
+        throw GenericError(ex)
+    }
+
+    @Mutation("removeUserMessage")
+    @Throws(BCOGraphQLError::class)
+    fun removeUserMessage(
+        @Arg("unitId") unitId: String?,
+        env: DataFetchingEnvironment,
+    ): UserMessage = try {
+        val userMessage = Registries.getMessageRegistry(
+            ServerError.BCO_TIMEOUT_SHORT,
+            ServerError.BCO_TIMEOUT_TIME_UNIT
+        ).getUserMessageById(unitId)
+        Registries.getMessageRegistry(
+            ServerError.BCO_TIMEOUT_SHORT,
+            ServerError.BCO_TIMEOUT_TIME_UNIT
+        ).removeUserMessageAuthenticated(
+            userMessage,
+            env.context.auth
+        )[ServerError.BCO_TIMEOUT_SHORT, ServerError.BCO_TIMEOUT_TIME_UNIT]
+    } catch (ex: RuntimeException) {
+        throw GenericError(ex)
+    } catch (ex: CouldNotPerformException) {
+        throw GenericError(ex)
+    } catch (ex: InterruptedException) {
+        throw GenericError(ex)
+    } catch (ex: ExecutionException) {
+        throw GenericError(ex)
+    } catch (ex: TimeoutException) {
+        throw GenericError(ex)
+    }
+
+    @Mutation("registerUserMessage")
+    @Throws(BCOGraphQLError::class)
+    fun registerUserMessage(
+        @Arg("userMessage") userMessage: UserMessage?,
+        env: DataFetchingEnvironment,
+    ): UserMessage = try {
+        Registries.getMessageRegistry(
+            ServerError.BCO_TIMEOUT_SHORT,
+            ServerError.BCO_TIMEOUT_TIME_UNIT
+        ).registerUserMessageAuthenticated(
+            userMessage,
+            env.context.auth
+        )[ServerError.BCO_TIMEOUT_SHORT, ServerError.BCO_TIMEOUT_TIME_UNIT]
+    } catch (ex: RuntimeException) {
+        throw GenericError(ex)
+    } catch (ex: CouldNotPerformException) {
+        throw GenericError(ex)
+    } catch (ex: InterruptedException) {
+        throw GenericError(ex)
+    } catch (ex: ExecutionException) {
+        throw GenericError(ex)
+    } catch (ex: TimeoutException) {
+        throw GenericError(ex)
+    }
+
     companion object {
         @Throws(BCOGraphQLError::class)
         fun getUnitConfigs(
@@ -438,5 +533,22 @@ import java.util.concurrent.*
         } catch (ex: InterruptedException) {
             throw GenericError(ex)
         }
+
+        @Throws(BCOGraphQLError::class)
+        fun getUserMessages(
+        ): ImmutableList<UserMessage> = try {
+            ImmutableList.copyOf(
+                Registries.getMessageRegistry(
+                    ServerError.BCO_TIMEOUT_SHORT,
+                    ServerError.BCO_TIMEOUT_TIME_UNIT
+                ).userMessages
+            )
+        } catch (ex: RuntimeException) {
+            throw GenericError(ex)
+        } catch (ex: CouldNotPerformException) {
+            throw GenericError(ex)
+        } catch (ex: InterruptedException) {
+            throw GenericError(ex)
+        }
     }
 }

module/api/graphql/src/main/java/org/openbase/bco/api/graphql/subscriptions/MessageRegistrySubscriptionObserver.kt

@@ -0,0 +1,50 @@
+package org.openbase.bco.api.graphql.subscriptions
+
+import com.google.common.collect.ImmutableList
+import org.openbase.bco.api.graphql.error.ServerError
+import org.openbase.bco.api.graphql.schema.RegistrySchemaModule
+import org.openbase.bco.registry.remote.Registries
+import org.openbase.jul.pattern.provider.DataProvider
+import org.openbase.type.domotic.communication.UserMessageType
+import org.openbase.type.domotic.registry.MessageRegistryDataType
+
+class MessageRegistrySubscriptionObserver() :
+    AbstractObserverMapper<DataProvider<MessageRegistryDataType.MessageRegistryData>, MessageRegistryDataType.MessageRegistryData, List<UserMessageType.UserMessage>>() {
+    private val userMessages: MutableList<UserMessageType.UserMessage>
+
+    init {
+        Registries.getMessageRegistry(
+            ServerError.BCO_TIMEOUT_SHORT,
+            ServerError.BCO_TIMEOUT_TIME_UNIT
+        )
+        userMessages = ArrayList(
+            RegistrySchemaModule.getUserMessages()
+        )
+    }
+
+    @Throws(Exception::class)
+    override fun update(
+        source: DataProvider<MessageRegistryDataType.MessageRegistryData>,
+        target: MessageRegistryDataType.MessageRegistryData,
+    ) {
+        val newUserMessages: ImmutableList<UserMessageType.UserMessage> =
+            RegistrySchemaModule.getUserMessages()
+        if (newUserMessages == userMessages) {
+            // nothing has changed
+            return
+        }
+
+        // store update
+        userMessages.clear()
+        userMessages.addAll(newUserMessages)
+        super.update(source, target)
+    }
+
+    @Throws(Exception::class)
+    override fun mapData(
+        source: DataProvider<MessageRegistryDataType.MessageRegistryData>,
+        data: MessageRegistryDataType.MessageRegistryData,
+    ): List<UserMessageType.UserMessage> {
+        return userMessages
+    }
+}