@@ -544,7 +544,7 @@ public virtual void Write(AngularWriteConfiguration configuration)
544
544
methodTemplate . WithCode ( Code . Declare ( Code . Generic ( "Subject" , Code . Void ( ) ) , subjectName , Code . New ( Code . Generic ( "Subject" , Code . Void ( ) ) ) ) )
545
545
. WithCode (
546
546
Code . This ( ) . Method ( connectMethod ) . Method ( "pipe" ,
547
- Code . Method ( "mergeMap" , Code . Lambda ( Code . This ( ) . Field ( connectionField ) ) ) ,
547
+ Code . Method ( "mergeMap" , Code . Lambda ( Code . This ( ) . Field ( connectionField . Name + "!" ) ) ) ,
548
548
Code . Method ( "take" , Code . Number ( 1 ) ) ,
549
549
Code . Method ( "mergeMap" , Code . Lambda ( "connection" , Code . Local ( "connection" ) . Method ( "send" , parameters ) )
550
550
) )
@@ -616,7 +616,7 @@ private bool WriteDateFixes(ClassTemplate classTemplate, List<MethodTemplate> co
616
616
this . AddUsing ( model , classTemplate , controllerOptions , relativeModelPath ) ;
617
617
bool hasLocalDateProperty = false ;
618
618
MethodTemplate convertDateMethodTemplate = classTemplate . AddMethod ( methodName , Code . Void ( ) ) . Private ( )
619
- . WithParameter ( model . ToTemplate ( ) , "model" )
619
+ . WithParameter ( model . ToTemplate ( ) , "model? " )
620
620
. WithCode ( Code . If ( Code . Local ( "!model" ) ) . WithCode ( Code . Return ( ) ) ) ;
621
621
convertDateMethods . Add ( convertDateMethodTemplate ) ;
622
622
foreach ( PropertyTransferObject property in model . Properties )
@@ -669,7 +669,7 @@ private bool WriteDateFixes(ClassTemplate classTemplate, List<MethodTemplate> co
669
669
{
670
670
hasLocalDateProperty = true ;
671
671
string convertMethodName = $ "convert{ property . Type . Name . ToPascalCase ( ) } Date";
672
- convertDateMethodTemplate . WithCode ( Code . This ( ) . Method ( convertMethodName , Code . Local ( "model" ) . Field ( propertyName ) ) ) ;
672
+ convertDateMethodTemplate . WithCode ( Code . This ( ) . Method ( convertMethodName , Code . Local ( "model" ) . Field ( propertyName ) ) . Close ( ) ) ;
673
673
}
674
674
}
675
675
}
0 commit comments